changes from eric