changes based on marina's comments