refinement of new raw API