Some adaptions for the schedule