Improved Coupling
fix merge bug