Some TimeDaySystem polishing...