Changed a couple of other things