Fixed Extraction, Now works much faster