Rejig the scheduler