finish up raw functionality