Shayan/scheduler