updated extractors

now fits better