refactoring and remote exchange...