add some scheduling stuff
merged