Updated to handle 1 digit hours and minutes