Changed a couple of things