Added ability to extract without raw

if you are into that kinda thing