refactor with day 2