basic merge in ExchangeController + other changes
Refactoring