Worked a bit on the schedules