working on shedule
merged