Better feature detect