still working on revamping scheduler