Improve feature extraction 3
Improve feature extraction 4