significant rejigging
yet more rejiggifying