working on scheduling feature