added date/time formatting