Changed a couple of more things