Nicer feature detection