merging with @mledoze countries project