improved extractor w/ tables