changed timestamp to include date