Improved scheduler