Scheduler added
Fixed everything