Refactor so that "moment" of the schedule goes on options not on the schedule