Changes needed for bi-exchangebot