full integration of new feature extraction code