Tested extractor.
Revert "Tested extractor."

This reverts commit 6859773f2aab39654b75bf468e5af0c07610fb79.
Revert "Revert "Tested extractor.""

This reverts commit e927fd2d2f541b330ddb4b4d7f006151dd3263f4.