more changes to scheduling