Added separate contexts for matches and targets, instead of having combined contexts...