cschedule & functions updated with unwrap function