Further work
Swap the files