continue working on transition handling code in scheduler