Improve design of planning and weeks.