Changes in ExtractKeyPoints: Uncomment stuff