replaced make_pair with list initialize