But The Extraction Tool Needs To Change