*use Pair class
*remove some