refactor tuesday