add in eric's stuff