Added functions, commented out checking the from_country.