Added 24-hour support;