Updated scheduler