Changed a couple stuffs