Just changing and adding a few thigs to extract the feature itself in
this library