Finalizing integration with MSFT implementation