modifications based on integration testing