Enhanced the match interpret alogrithm