#51 changes after full integration testing