added 24 hour clock option