added back am/pm formatting