Refactoring, added country borders.