added country info support
aligned code