second pass at country-level mapping