Schedule update

Need a better solution