more schedule stuff
merge