eric's changes