Added final country handling code