added check for national/international methods