added schedule maker
merge conflict