various changes for completing the integration