Now using raw instead of raw2