Updated scheduler as well