Z-match-Upgrade