added 24 hour support