small changes based on our ER