Updated to 24 hour clock