Added 18h and fixed the default time