Changed a couple of things around