tweaked a couple of things