changes to extractor