scheduling + fixes 2.3