Improved the scheduler re-scheduler mechanism.