refactored country_visit mode