changed the templates for multiple time formats