Refactored Coordination
Merge branch 'Coordination'