With enum
Fixed updating selected day.