Rewritten Coupling, tested
before merge with mazen
remove conflicts
Merge with mazen
cleaning up