Much simpler retrofitting

I had a brainwave and reduced a lot of redundant code