Changes for seperate scheduler