changes for raw3-5