Some rejiggering