rejiggering some more