changes to drug extractor