rejiggered some stuffs