refactory in agenda and schedules