Dima/add#exchange