Major changes due to integration and functional testing (1st phase)