New scheduler logic updates