matching of stops now kind of works for the first time