FWI, the last commit was mine, not Eric's