diff --git a/src/appointment.php b/src/appointment.php
index 7347858..12fdde6 100644
--- a/src/appointment.php
+++ b/src/appointment.php
@@ -21,13 +21,8 @@
 
     $pdo = connectDatabase();
     ?>
-    <?php if($_SESSION["user_type"] == 2): ?>
-        $user = finduser($pdo, $_SESSION["user"]);
-        $events = fetchCalendarEvents($pdo, $user[0][4]);
-        $holidays = fetchDoctorHolidays($pdo, $user[0][4]);
-        $calendar_settings = fetchCalendarSettings($pdo, $user[0][4]);
-    <?php else: ?>
-        <form name="select_doctor" method="get">
+    <?php if($_SESSION["user_type"] == 1): ?>
+        <form name="select_doctor" method="post" action="appointment_management.php">
         <?php $doctors = listDoctors($pdo); ?>
         <div class="input-group">
             <select id="medico" name="medico">
@@ -38,11 +33,6 @@
             </select>
             <button class="create_btn" type="submit" name="select">Seleccionar</button>
         </div>
-        <?php
-            $events = fetchCalendarEvents($pdo, $_GET["medico"]);
-            $holidays = fetchDoctorHolidays($pdo, $_GET["medico"]);
-            $calendar_settings = fetchCalendarSettings($pdo, $_GET["medico"]);
-        ?>
     <?php endif; ?>
     <?php closeDatabase($pdo); ?>
         <div class="response"></div>
diff --git a/src/appointment_management.php b/src/appointment_management.php
new file mode 100644
index 0000000..43101ff
--- /dev/null
+++ b/src/appointment_management.php
@@ -0,0 +1,48 @@
+<?php
+include'database.php';
+
+session_start();
+
+function fetchDoctor($pdo){
+    if($_SESSION["user_type"] == 2){
+        $user = finduser($pdo, $_SESSION["user"]);
+        return $user[0][4];
+    } 
+    $data = $_POST;
+    return $_POST["medico"];
+}
+
+
+function listEvents(){
+    $pdo = connectDatabase();
+    $doctor = fetchDoctor($pdo);
+    $events = fetchCalendarEvents($pdo, $doctor);
+    closeDatabase($pdo);
+    return json_encode($events);
+}
+
+
+function listHolidays(){
+    $pdo = connectDatabase();
+    $doctor = fetchDoctor($pdo);
+    $holidays = fetchDoctorHolidays($pdo, $doctor);
+    closeDatabase($pdo);
+    return json_encode($holidays);
+}
+
+
+function listCalendarSettings(){
+    $pdo = connectDatabase();
+    $doctor = fetchDoctor($pdo);
+    $calendar_settings = fetchCalendarSettings($pdo, $doctor);
+    closeDatabase($pdo);
+    return json_encode($events);
+}
+
+
+if (isset($_GET["list"])) {
+    listEvents();
+    listHolidays();
+    listCalendarSettings();
+    header('location: appointment.php');
+}
diff --git a/src/calendar.js b/src/calendar.js
index c4b57b7..0b15506 100644
--- a/src/calendar.js
+++ b/src/calendar.js
@@ -15,7 +15,7 @@
 
    header: {
 
-    left: 'prev,next today',
+    left: 'prev,next,today',
 
     center: 'title',
 
@@ -24,7 +24,7 @@
    },
 
 
-   events: "events.php",
+   events: "appointment_management.php?list=1",
 
 
    eventRender: function(event, element, view) {
@@ -47,10 +47,9 @@
 
    select: function(start, end, allDay) {
 
-   var title = prompt('Event Title:');
+   var title = prompt('Título: ');
 
-
-   if (title) {
+   var duration = prompt('Duración: ');
 
    var start = $.fullCalendar.formatDate(start, "Y-MM-DD HH:mm:ss");
 
@@ -58,7 +57,7 @@
 
    $.ajax({
 
-	   url: 'add_events.php',
+	   url: 'appointment_management.php',
 
 	   data: 'title='+ title+'&start='+ start +'&end='+ end,
 
@@ -86,11 +85,9 @@
 
    },
 
-   true
 
    );
 
-   }
 
    calendar.fullCalendar('unselect');
 
diff --git a/src/calendar.php b/src/calendar.php
index 3f7857f..f6a729e 100644
--- a/src/calendar.php
+++ b/src/calendar.php
@@ -32,7 +32,7 @@
 
             $pdo = connectDatabase();
 
-            $list = listHolidays($pdo);
+            $list = fetchHolidays($pdo);
 
             foreach ($list as $row) :
             ?>
diff --git a/src/database.php b/src/database.php
index 277913c..bcf7c9d 100644
--- a/src/database.php
+++ b/src/database.php
@@ -187,7 +187,7 @@ function fetchRegions($pdo)
     return $data;
 }
 
-function listHolidays($pdo)
+function fetchHolidays($pdo)
 {
     $query = "SELECT * FROM festivo";
     $result = $pdo->prepare($query);