remerging kim's change to maps