adding scheduler
merged