Added 12 hour support