Now also checking if there is a match on ways