#14 Change DayTime algorithm