Dan's first edit and datestamp