rejiggered everything