tender refactor and user for each day