Some clarity changes