Modification from RAW3-1

Modifications from the raw3-1