Change back to old scheduler code