Added ability to work 24:00/00:00