rawbuf changes