More rejigging