replaced Pair with Point