Adding eric's changes

Just another commit