A change

I would very much like to merge this into master