Worked on scheduler