More work on Schedule.php