changes as result of integration testing