Controlling raw (17/18)

Controlling raw