rejiggered some things