changed default date/time logic