Update raw.c

Part of CAF merge