updated extractors