1) match and lift
2) rename goaltyp_match to gt_match