minor rejiggering