Slightly less awful

Still not to be looked at