Changed a couple things