Eric's edit