Updated feature extractor!