Changed a good bit