no longer need tuples
Use proper substring matching