New feature extraction -- not debugged!