Phase 1 Final Changes as per client