rejiggering some stuff.