modified a couple of things