taking eric's comments into account