small changes before scheduler