diff --git a/src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java b/src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java
index a3833f2..3223528 100644
--- a/src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java
+++ b/src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java
@@ -26,9 +26,9 @@ private Set<? extends CountriesRequestCombiner> getAllCountries() {
 
     private Set<? extends CountriesRequestCombiner> getRequest() {
         if (checkMemberShipStatusAndTokenMatch())
-            return initializeCountriesEntity().stream().map(mapper::mapper).collect(Collectors.toSet());
-        else
             return initializeCountriesEntity().stream().map(mapper::mapToMembershipCountryRequest).collect(Collectors.toSet());
+        else
+            return initializeCountriesEntity().stream().map(mapper::mapper).collect(Collectors.toSet());
     }
 
     private Set<? extends CountriesRequestCombiner> getCountryByName() {
diff --git a/src/main/java/org/airpenthouse/GoTel/util/executors/CountriesExecutors.java b/src/main/java/org/airpenthouse/GoTel/util/executors/CountriesExecutors.java
index 97067b4..ec6eeda 100644
--- a/src/main/java/org/airpenthouse/GoTel/util/executors/CountriesExecutors.java
+++ b/src/main/java/org/airpenthouse/GoTel/util/executors/CountriesExecutors.java
@@ -30,10 +30,10 @@ private ExecutorService determineNoThreadToUse() {
             Members with registered successful uses more threads than non membership
          */
         if (checkMemberShipStatusAndTokenMatch()) {
-            final var noProcesses = Runtime.getRuntime().availableProcessors();
+            final var noProcesses = Runtime.getRuntime().availableProcessors() * 2;
             executeCountries = Executors.newFixedThreadPool(noProcesses);
         } else {
-            final var noProcesses = Runtime.getRuntime().availableProcessors() * 2;
+            final var noProcesses = Runtime.getRuntime().availableProcessors() ;
             executeCountries = Executors.newFixedThreadPool(noProcesses);
         }
         return executeCountries;