Added MatchState and the logic that follows