still having issues in matching - going to try something different