Changes based on Dan's thoughts