Fixed extraction

Extraction looks sane now