Add rejigged scheduler
scheduler