changes based on testing with Jaime