fix extractor and CS fix