Fixing more of my own stupidity
Reshuffle things again