made changes
refactoried schedule