Better filter in solver... still need to count fingers