modifying feature extraction even more