exchanged some stuff and tested