made getInstance() work and use make_pair