Added 12/24hr support