Updated to include the notion of am/pm