restructured shift-hour selection