final changes before the deployment for 2070/2071