More rejiggering