Changed some more exchange codes