changes based on kate comments