some changes to Schedule