Extractor Draft Updated