some changes to extractors