Changed a bit here and there