make some modification of scheduler