Great Commit concerning timestamps