Working on week-based schedule