diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py
index 3766fe48f473c3c3537473605e0ab1ab090f9351..a3fd5e788d95c9a7ed3a01b1a80ef8619298de71 100644
--- a/autosubmit/autosubmit.py
+++ b/autosubmit/autosubmit.py
@@ -307,6 +307,8 @@ class Autosubmit:
                                    default=False, help='Disable transitive reduction')
             subparser.add_argument('-v', '--update_version', action='store_true',
                                    default=False, help='Update experiment version')
+            subparser.add_argument('-db', '--database', action='store_true',
+                                   default=False, help='Use database for statistics')
             # Clean
             subparser = subparsers.add_parser(
                 'clean', description="clean specified experiment")
@@ -687,7 +689,7 @@ class Autosubmit:
                                       args.txt_logfiles, args.profile, detail=False)
         elif args.command == 'stats':
             return Autosubmit.statistics(args.expid, args.filter_type, args.filter_period, args.output, args.hide,
-                                         args.notransitive)
+                                         args.notransitive, args.database)
         elif args.command == 'clean':
             return Autosubmit.clean(args.expid, args.project, args.plot, args.stats)
         elif args.command == 'recovery':
@@ -2404,10 +2406,13 @@ class Autosubmit:
         """
         save_1 = False
         save_2 = False
+        wrapper_errors = {}
+        any_job_submitted = False
         try:
             for platform in platforms_to_test:
-                packages_to_submit = JobPackager(as_conf, platform, job_list, hold=hold).build_packages()
-                save_1, failed_packages, error_message, valid_packages_to_submit = platform.submit_ready_jobs(as_conf,
+                packager = JobPackager(as_conf, platform, job_list, hold=hold)
+                packages_to_submit = packager.build_packages()
+                save_1, failed_packages, error_message, valid_packages_to_submit, any_job_submitted = platform.submit_ready_jobs(as_conf,
                                                                                                               job_list,
                                                                                                               platforms_to_test,
                                                                                                               packages_persistence,
@@ -2415,7 +2420,9 @@ class Autosubmit:
                                                                                                               inspect=inspect,
                                                                                                               only_wrappers=only_wrappers,
                                                                                                               hold=hold)
+                wrapper_errors.update(packager.wrappers_with_error)
                 # Jobs that are being retrieved in batch. Right now, only available for slurm platforms.
+
                 if not inspect and len(valid_packages_to_submit) > 0:
                     job_list.save()
                 save_2 = False
@@ -2439,11 +2446,17 @@ class Autosubmit:
                             job.write_submit_time(wrapper_submit_time=wrapper_time)
                             wrapper_time = job.submit_time_timestamp
 
-
+            if wrapper_errors and not any_job_submitted and len(job_list.get_in_queue()) == 0:
+                # Deadlock situation
+                err_msg = ""
+                for wrapper in wrapper_errors:
+                    err_msg += f"wrapped_jobs:{wrapper} in {wrapper_errors[wrapper]}\n"
+                raise AutosubmitCritical(err_msg, 7014)
             if save_1 or save_2:
                 return True
             else:
                 return False
+
         except AutosubmitError as e:
             raise
         except AutosubmitCritical as e:
@@ -2666,7 +2679,7 @@ class Autosubmit:
         return True
 
     @staticmethod
-    def statistics(expid, filter_type, filter_period, file_format, hide, notransitive=False):
+    def statistics(expid, filter_type, filter_period, file_format, hide, notransitive=False, db = False):
         """
         Plots statistics graph for a given experiment.
         Plot is created in experiment's plot folder with name <expid>_<date>_<time>.<file_format>
@@ -2681,7 +2694,8 @@ class Autosubmit:
         :type hide: bool
         :param notransitive: Reduces workflow linkage complexity
         :type hide: bool
-
+        :param db: Use database to get the statistics
+        :type db: bool
         """
         try:
             Log.info("Loading jobs...")
@@ -2692,6 +2706,7 @@ class Autosubmit:
             job_list = Autosubmit.load_job_list(expid, as_conf, notransitive=notransitive)
             for job in job_list.get_job_list():
                 job._init_runtime_parameters()
+                job.update_dict_parameters(as_conf)
             Log.debug("Job list restored from {0} files", pkl_dir)
             jobs = StatisticsUtils.filter_by_section(job_list.get_job_list(), filter_type)
             jobs, period_ini, period_fi = StatisticsUtils.filter_by_time_period(jobs, filter_period)
diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index f9a78fe13d9371116ece28706945986a9d13680f..c76ecf5e13be315996bcfd1cceee6ca60cd58cd2 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -22,6 +22,8 @@ Main module for Autosubmit. Only contains an interface class to all functionalit
 """
 
 from collections import OrderedDict
+
+from autosubmit.job import job_utils
 from contextlib import suppress
 import copy
 import datetime
@@ -263,6 +265,7 @@ class Job(object):
         self._memory_per_task = ''
         self.log_retrieved = False
         self.start_time_placeholder = ""
+        self.processors_per_node = ""
 
     @property
     @autosubmit_parameter(name='tasktype')
@@ -1304,6 +1307,11 @@ class Job(object):
             else:
                 return default_status
     def update_platform_parameters(self,as_conf,parameters,job_platform):
+        if not job_platform:
+            submitter = job_utils._get_submitter(as_conf)
+            submitter.load_platforms(as_conf)
+            job_platform = submitter.platforms[self.platform_name]
+            self.platform = job_platform
         for key,value in as_conf.platforms_data.get(job_platform.name,{}).items():
             parameters["CURRENT_"+key.upper()] = value
         parameters['CURRENT_ARCH'] = job_platform.name
@@ -1909,7 +1917,8 @@ class Job(object):
         # Parameters that affect to all the rest of parameters
         self.update_dict_parameters(as_conf)
         parameters = parameters.copy()
-        parameters.update(as_conf.parameters)
+        if hasattr(as_conf,"parameters"):
+            parameters.update(as_conf.parameters)
         parameters.update(default_parameters)
         parameters = as_conf.substitute_dynamic_variables(parameters,25)
         parameters['ROOTDIR'] = os.path.join(
diff --git a/autosubmit/job/job_list.py b/autosubmit/job/job_list.py
index 0cd615b786e5b49c7d73faef7945bf0074bc8326..c17e03fb1be33844a1f02d18fc0a41aae17552ad 100644
--- a/autosubmit/job/job_list.py
+++ b/autosubmit/job/job_list.py
@@ -46,7 +46,7 @@ from autosubmit.job.job_common import Status, bcolors
 from autosubmit.job.job_dict import DicJobs
 from autosubmit.job.job_package_persistence import JobPackagePersistence
 from autosubmit.job.job_packages import JobPackageThread
-from autosubmit.job.job_utils import Dependency
+from autosubmit.job.job_utils import Dependency, _get_submitter
 from autosubmit.job.job_utils import transitive_reduction
 from autosubmitconfigparser.config.basicconfig import BasicConfig
 from autosubmitconfigparser.config.configcommon import AutosubmitConfig
@@ -311,7 +311,33 @@ class JobList(object):
                 raise AutosubmitCritical(
                     "Some section jobs of the wrapper:{0} are not in the current job_list defined in jobs.conf".format(
                         wrapper_section), 7014, str(e))
-
+        # divide job_list per platform name
+        job_list_per_platform = self.split_by_platform()
+
+        for platform in job_list_per_platform:
+            first = True
+            for job in job_list_per_platform[platform]:
+                job_platform = None
+                if first:
+                    if not job.platform and hasattr(job, "platform_name") and job.platform_name:
+                        submitter = _get_submitter(as_conf)
+                        submitter.load_platforms(as_conf)
+                        job_platform = submitter.platforms[job.platform_name]
+                    first = False
+                job.platform = job_platform
+
+    def split_by_platform(self):
+        """
+        Splits the job list by platform name
+        :return: job list per platform
+        :rtype: dict
+        """
+        job_list_per_platform = dict()
+        for job in self._job_list:
+            if job.platform not in job_list_per_platform:
+                job_list_per_platform[job.platform] = []
+            job_list_per_platform[job.platform].append(job)
+        return job_list_per_platform
     def _add_all_jobs_edge_info(self, dic_jobs, option="DEPENDENCIES"):
         jobs_data = dic_jobs.experiment_data.get("JOBS", {})
         sections_gen = (section for section in jobs_data.keys())
diff --git a/autosubmit/job/job_packager.py b/autosubmit/job/job_packager.py
index 1271ec2bb9ec1c062f44a52d2c84dd622c6996a1..a4ae2547fec1ac87c61ce26f02a5d64a856540af 100644
--- a/autosubmit/job/job_packager.py
+++ b/autosubmit/job/job_packager.py
@@ -60,6 +60,7 @@ class JobPackager(object):
         self.wrapper_info = list()
         self.calculate_job_limits(platform)
         self.special_variables = dict()
+        self.wrappers_with_error = {}
 
 
         #todo add default values
@@ -301,8 +302,9 @@ class JobPackager(object):
                             packages_to_submit.append(package)
                             max_jobs_to_submit = max_jobs_to_submit - 1
                     if error:
-                        if len(self._jobs_list.get_in_queue()) == 0:  # When there are not more possible jobs, autosubmit will stop the execution
-                            raise AutosubmitCritical(self.error_message_policy(min_h, min_v, wrapper_limits, p.wallclock, balanced), 7014)
+                        job_names = [job.name for job in p.jobs]
+                        job_names = ','.join(job_names)
+                        self.wrappers_with_error[job_names] =  self.error_message_policy(min_h, min_v, wrapper_limits, p.wallclock, balanced)
                 else:
                     Log.info(
                         "Wrapper policy is set to flexible and there is a deadlock, Autosubmit will submit the jobs sequentially")
@@ -496,6 +498,7 @@ class JobPackager(object):
                 built_packages_tmp = self._build_vertical_packages(jobs, wrapper_limits)
 
             packages_to_submit,max_jobs_to_submit = self.check_packages_respect_wrapper_policy(built_packages_tmp,packages_to_submit,max_jobs_to_submit,wrapper_limits,any_simple_packages)
+
         # Now, prepare the packages for non-wrapper jobs
         for job in non_wrapped_jobs:
             if job.section in section_jobs_to_submit:
@@ -516,6 +519,7 @@ class JobPackager(object):
             if job.section in section_jobs_to_submit:
                 section_jobs_to_submit[job.section] = section_jobs_to_submit[job.section] - 1
 
+
         for package in packages_to_submit:
             self.max_jobs = self.max_jobs - 1
             package.hold = self.hold
@@ -557,7 +561,7 @@ class JobPackager(object):
         return jobs_by_section
 
 
-    def _build_horizontal_packages(self, section_list, wrapper_limits, section,wrapper_info=[]):
+    def _build_horizontal_packages(self, section_list, wrapper_limits, section, wrapper_info={}):
         packages = []
         horizontal_packager = JobPackagerHorizontal(section_list, self._platform.max_processors, wrapper_limits,
                                                     wrapper_limits["max"], self._platform.processors_per_node, self.wrapper_method[self.current_wrapper_section])
diff --git a/autosubmit/job/job_utils.py b/autosubmit/job/job_utils.py
index d407f016047fcd5fd36e5b9be5e1592945cde8cc..c7ae6709e1b3353a6d1382a1a01ea38af4c5cf62 100644
--- a/autosubmit/job/job_utils.py
+++ b/autosubmit/job/job_utils.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 import math
+
+from autosubmit.platforms.paramiko_submitter import ParamikoSubmitter
 from log.log import Log, AutosubmitCritical
 import os
 from autosubmit.job.job_package_persistence import JobPackagePersistence
@@ -36,6 +38,22 @@ CALENDAR_UNITSIZE_ENUM = {
     "year": 3
 }
 
+def _get_submitter(as_conf):
+    """
+    Returns the submitter corresponding to the communication defined on autosubmit's config file
+
+    :return: submitter
+    :rtype: Submitter
+    """
+    try:
+        communications_library = as_conf.get_communications_library()
+    except Exception as e:
+        communications_library = 'paramiko'
+    if communications_library == 'paramiko':
+        return ParamikoSubmitter()
+    else:
+        # only paramiko is available right now.
+        return ParamikoSubmitter()
 
 def is_leap_year(year):
     """Determine whether a year is a leap year."""
diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py
index 1228299f106c76c3a0b41b9446ad9a60781752da..23905d125a7fbf25ccbd03a12048fd994e36cada 100644
--- a/autosubmit/platforms/platform.py
+++ b/autosubmit/platforms/platform.py
@@ -256,6 +256,7 @@ class Platform(object):
         :return: True if at least one job was submitted, False otherwise \n
         :rtype: Boolean
         """
+        any_job_submitted = False
         save = False
         failed_packages = list()
         error_message = ""
@@ -286,6 +287,7 @@ class Platform(object):
                         packages_persistence.save(
                             package.name, package.jobs, package._expid, inspect)
                     for innerJob in package._jobs:
+                        any_job_submitted = True
                         # Setting status to COMPLETED, so it does not get stuck in the loop that calls this function
                         innerJob.status = Status.COMPLETED
                         innerJob.updated_log = False
@@ -335,8 +337,9 @@ class Platform(object):
                 raise
             except Exception as e:
                 raise
-
-        return save, failed_packages, error_message, valid_packages_to_submit
+        if valid_packages_to_submit:
+            any_job_submitted = True
+        return save, failed_packages, error_message, valid_packages_to_submit, any_job_submitted
 
     @property
     def serial_platform(self):
diff --git a/requeriments.txt b/requeriments.txt
index c2bbe8c022384ec4b5f7a06029f514c4be9fc7a4..45a9d269d8bf3dc659515198f9439a1da19e3692 100644
--- a/requeriments.txt
+++ b/requeriments.txt
@@ -1,13 +1,13 @@
 zipp>=3.1.0
-setuptools>=60.8.2
+setuptools>=60.0.0
 cython
-autosubmitconfigparser==1.0.59
+autosubmitconfigparser==1.0.61
 paramiko>=3.4
 bcrypt>=3.2
 PyNaCl>=1.5.0
 configobj>=5.0.6
 python-dateutil>=2.8.2
-matplotlib == 3.8.3
+matplotlib <= 3.8.3
 py3dotplus>=1.1.0
 pyparsing>=3.0.7
 mock>=4.0.3
diff --git a/setup.py b/setup.py
index 56cbf3f52ec157fd8961797830238a45756f2a31..227908fa37b337a62b1ad7fd4221f221f2670298 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,73 @@ setup(
     url='http://www.bsc.es/projects/earthscience/autosubmit/',
     download_url='https://earth.bsc.es/wiki/doku.php?id=tools:autosubmit',
     keywords=['climate', 'weather', 'workflow', 'HPC'],
-    install_requires=['zipp>=3.1.0','ruamel.yaml==0.17.21','cython','autosubmitconfigparser','bcrypt>=3.2','packaging>19','six>=1.10.0','configobj>=5.0.6','python-dateutil>=2.8.2','matplotlib<3.6','py3dotplus>=1.1.0','pyparsing>=3.0.7','paramiko>=2.9.2','mock>=4.0.3','portalocker>=2.3.2,<=2.7.0','networkx==2.6.3','requests>=2.27.1','bscearth.utils>=0.5.2','cryptography>=36.0.1','setuptools>=60.8.2','xlib>=0.21','pip>=22.0.3','pythondialog','pytest','nose','coverage','PyNaCl>=1.5.0','Pygments','psutil','rocrate==0.*'],
+    # same but formatted
+    # zipp>=3.1.0
+    # setuptools>=60.8.2
+    # cython
+    # autosubmitconfigparser==1.0.61
+    # paramiko>=3.4
+    # bcrypt>=3.2
+    # PyNaCl>=1.5.0
+    # configobj>=5.0.6
+    # python-dateutil>=2.8.2
+    # matplotlib == 3.8.3
+    # py3dotplus>=1.1.0
+    # pyparsing>=3.0.7
+    # mock>=4.0.3
+    # portalocker>=2.3.2,<=2.7.0
+    # networkx==2.6.3
+    # requests>=2.27.1
+    # bscearth.utils>=0.5.2
+    # cryptography>=36.0.1
+    # xlib>=0.21
+    # pip>=22.0.3
+    # ruamel.yaml==0.17.21
+    # pythondialog
+    # pytest
+    # nose
+    # coverage
+    # six>=1.10.0
+    # Pygments
+    # packaging==20
+    # typing>=3.7
+    # wheel
+    # psutil
+    # rocrate==0.*
+    install_requires=[
+        'zipp>=3.1.0',
+        'setuptools>=68.0.0',
+        'cython',
+        'autosubmitconfigparser==1.0.61',
+        'paramiko>=3.4',
+        'bcrypt>=3.2',
+        'PyNaCl>=1.5.0',
+        'configobj>=5.0.6',
+        'python-dateutil>=2.8.2',
+        'matplotlib < 3.5.2',
+        'py3dotplus>=1.1.0',
+        'pyparsing>=3.0.7',
+        'mock>=4.0.3',
+        'portalocker>=2.3.2,<=2.7.0',
+        'networkx==2.6.3',
+        'requests>=2.27.1',
+        'bscearth.utils>=0.5.2',
+        'cryptography>=36.0.1',
+        'xlib>=0.21',
+        'pip>=22.0.3',
+        'ruamel.yaml==0.17.21',
+        'pythondialog',
+        'pytest',
+        'nose',
+        'coverage',
+        'six>=1.10.0',
+        'Pygments',
+        'packaging==20',
+        'typing>=3.7',
+        'wheel',
+        'psutil',
+        'rocrate==0.*'
+    ],
     classifiers=[
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.9",
diff --git a/test/unit/test_job_list.py b/test/unit/test_job_list.py
index 395b4ecb507f0dbebd28e64bcd07e6bc70898398..5317ad18260861ce7b05b0ef295078ca204a2544 100644
--- a/test/unit/test_job_list.py
+++ b/test/unit/test_job_list.py
@@ -1,3 +1,5 @@
+from unittest.mock import MagicMock
+
 import os
 from unittest import TestCase
 from copy import copy
@@ -399,6 +401,7 @@ class TestJobList(TestCase):
         job_list_aux.run_members = "not_exists"
         self.assertEqual(len(job_list_aux._job_list), 0)
 
+
     #autosubmit/job/job_list.py:create_dictionary - line 132
     def test_create_dictionary(self):
         parser_mock = Mock()
@@ -407,51 +410,58 @@ class TestJobList(TestCase):
         self.as_conf.jobs_data = self.as_conf.experiment_data["JOBS"]
         factory = YAMLParserFactory()
         factory.create_parser = Mock(return_value=parser_mock)
-        job_list = JobList(self.experiment_id, FakeBasicConfig,
-                           factory, JobListPersistencePkl(), self.as_conf)
-        job_list._create_jobs = Mock()
-        job_list._add_dependencies = Mock()
-        job_list.update_genealogy = Mock()
-        job_list._job_list = [Job('random-name_fake-date1_fake-member1', 9999, Status.WAITING, 0),
-                              Job('random-name2_fake_date2_fake-member2', 99999, Status.WAITING, 0)]
-        date_list = ['fake-date1', 'fake-date2']
-        member_list = ['fake-member1', 'fake-member2']
-        num_chunks = 2
-        parameters = {'fake-key': 'fake-value',
-                      'fake-key2': 'fake-value2'}
-        graph = networkx.DiGraph()
-        job_list.graph = graph
-        # act
-        job_list.generate(
-            as_conf=self.as_conf,
-            date_list=date_list,
-            member_list=member_list,
-            num_chunks=num_chunks,
-            chunk_ini=1,
-            parameters=parameters,
-            date_format='H',
-            default_retrials=1,
-            default_job_type=Type.BASH,
-            wrapper_jobs={},
-            new=True,
-            create=True,
-        )
-        job_list._job_list[0].section = "fake-section"
-        job_list._job_list[0].date = "fake-date1"
-        job_list._job_list[0].member = "fake-member1"
-        job_list._job_list[0].chunk = 1
-        wrapper_jobs = {"WRAPPER_FAKESECTION": 'fake-section'}
-        num_chunks = 2
-        chunk_ini = 1
-        date_format = "day"
-        default_retrials = 1
-        job_list._get_date = Mock(return_value="fake-date1")
+        with patch('os.path.join', return_value='fake-tmp'):
+            job_list = JobList(self.experiment_id, FakeBasicConfig,
+                               factory, JobListPersistencePkl(), self.as_conf)
+            job_list._create_jobs = Mock()
+            job_list._add_dependencies = Mock()
+            job_list.update_genealogy = Mock()
+            job_list._job_list = [Job('random-name_fake-date1_fake-member1', 9999, Status.WAITING, 0),
+                                  Job('random-name2_fake_date2_fake-member2', 99999, Status.WAITING, 0)]
+            date_list = ['fake-date1', 'fake-date2']
+            member_list = ['fake-member1', 'fake-member2']
+            num_chunks = 2
+            parameters = {'fake-key': 'fake-value',
+                          'fake-key2': 'fake-value2'}
+            graph = networkx.DiGraph()
+            job_list.graph = graph
+            # act
 
-        # act
-        job_list.create_dictionary(date_list, member_list, num_chunks, chunk_ini, date_format, default_retrials,
-                                   wrapper_jobs, self.as_conf)
-        # assert
-        self.assertEqual(len(job_list._ordered_jobs_by_date_member["WRAPPER_FAKESECTION"]["fake-date1"]["fake-member1"]), 1)
+            with patch('autosubmit.job.job_list._get_submitter', autospec=True) as mock_get_submitter:
+                mock_submitter = mock_get_submitter.return_value
+                mock_submitter.load_platforms = MagicMock()
+                mock_submitter.load_platforms.return_value = ["fake-platform"]
+                mock_submitter.platforms = None
+                job_list.generate(
+                    as_conf=self.as_conf,
+                    date_list=date_list,
+                    member_list=member_list,
+                    num_chunks=num_chunks,
+                    chunk_ini=1,
+                    parameters=parameters,
+                    date_format='H',
+                    default_retrials=1,
+                    default_job_type=Type.BASH,
+                    wrapper_jobs={},
+                    new=True,
+                    create=True
+                )
+            job_list._job_list[0].section = "fake-section"
+            job_list._job_list[0].date = "fake-date1"
+            job_list._job_list[0].member = "fake-member1"
+            job_list._job_list[0].chunk = 1
+            wrapper_jobs = {"WRAPPER_FAKESECTION": 'fake-section'}
+            num_chunks = 2
+            chunk_ini = 1
+            date_format = "day"
+            default_retrials = 1
+            job_list._get_date = Mock(return_value="fake-date1")
+
+            # act
+            job_list.create_dictionary(date_list, member_list, num_chunks, chunk_ini, date_format, default_retrials,
+                                       wrapper_jobs, self.as_conf)
+            # assert
+            self.assertEqual(len(job_list._ordered_jobs_by_date_member["WRAPPER_FAKESECTION"]["fake-date1"]["fake-member1"]), 1)
 
 
     def new_job_list(self,factory,temp_dir):
diff --git a/test/unit/test_wrappers.py b/test/unit/test_wrappers.py
index 62ff9bc8d8e0405a6c8b4c803c714b512560b149..2c605bef3e4c25002d59ec72574d08276e83665b 100644
--- a/test/unit/test_wrappers.py
+++ b/test/unit/test_wrappers.py
@@ -1817,9 +1817,10 @@ class TestWrappers(TestCase):
 
         self.job_packager.wrapper_policy["WRAPPER_V"] = "mixed"
         packages_to_submit = []
-        with self.assertRaises(log.log.AutosubmitCritical):
-            self.job_packager.check_packages_respect_wrapper_policy(packages_h, packages_to_submit, max_jobs_to_submit, wrapper_limits)
-
+        self.job_packager.check_packages_respect_wrapper_policy(packages_h, packages_to_submit, max_jobs_to_submit, wrapper_limits)
+        error = self.job_packager.wrappers_with_error['expid_d1_m1_1_s2,expid_d1_m1_1_s2,expid_d1_m1_1_s2,expid_d1_m1_1_s2,expid_d1_m1_1_s2']
+        # check error not empty
+        assert error != ""
         self.job_packager.wrapper_policy["WRAPPER_V"] = "strict"
         packages_to_submit = []
         with self.assertRaises(log.log.AutosubmitCritical):