Just tweaked a couple of things