scheduler change next events improvements