Eric's changes to file 1