Update the extraction, not better way but working way