Updating Schedule: fixes #42 #45