diff --git a/public/archivetrf.php b/public/archivetrf.php
index a7d6d42..8622a4a 100644
--- a/public/archivetrf.php
+++ b/public/archivetrf.php
@@ -27,7 +27,6 @@ LEFT JOIN article_type ON `trf-details`.idarticletype=article_type.idarticletype
 LEFT JOIN certificationtype ON certificationtype.idcertificationtype=`trf-details`.idcertification 
 WHERE `trf-details`.idcompany='$idcompany' 
 AND `trf-details`.signedon ='' 
-AND `trf-details`.revcs != 'Y' 
 ORDER BY `trf-details`.trfnumber");
 $drafttrf->execute();
 ?>
diff --git a/public/companyprofile.php b/public/companyprofile.php
index 17df5dd..d08e864 100644
--- a/public/companyprofile.php
+++ b/public/companyprofile.php
@@ -145,20 +145,21 @@ $companyData = mysqli_fetch_assoc($companydetails);
                         </div><!--end col-->
                         <div class="card">
                             <div class="card-body">
-                                <h4 class="mt-0 header-title">Carica Logo Aziendale</h4>
+                                <h4 class="mt-0 header-title"><?php echo $uploadCompanyLogoTitle; ?></h4>
                                 <form action="upload_logocompany.php" method="post" enctype="multipart/form-data">
-                                    Seleziona l'immagine da caricare (solo JPG, JPEG, PNG):
+                                    <?php echo $selectImageToUploadTitle; ?>
                                     <input type="file" name="companyLogo" id="companyLogo" accept=".jpg, .jpeg, .png">
-                                    <button type="submit" class="btn btn-primary">Carica</button>
+                                    <button type="submit" class="btn btn-primary"><?php echo $uploadButtonTitle; ?></button>
                                 </form>
                                 <?php if (!empty($companyData["logoimage"])) : ?>
                                     <div class="logo-container" style="margin-top: 20px;">
-                                        <img src="<?php echo htmlspecialchars("logos/" . $companyData["logoimage"]); ?>" alt="Logo Aziendale" style="max-width: 200px; max-height: 200px;">
+                                        <img src="<?php echo htmlspecialchars("logos/" . $companyData["logoimage"]); ?>" alt="<?php echo $companyLogoAltTitle; ?>" style="max-width: 200px; max-height: 200px;">
                                     </div>
                                 <?php endif; ?>
                             </div>
                         </div>
 
+
                     </div>
                     <!-- end page title end breadcrumb -->
 
diff --git a/public/include/headscript2.php b/public/include/headscript2.php
index bc1379f..becf71b 100644
--- a/public/include/headscript2.php
+++ b/public/include/headscript2.php
@@ -1,4 +1,3 @@
-
 <?php
 
 ini_set('display_errors', 1);
@@ -12,27 +11,26 @@ include('../extra/auth.php');
 // logged in, and in that case we redirect
 // the user to vanguard login page.
 if (! Auth::check()) {
-	
-	redirectTo('login');
 
-} 
+	redirectTo('login');
+}
 
 $user = Auth::user();
 
-$iduserlogin=$user->present()->id;
-$nameuser=$user->present()->name;
-$emailuser=$user->present()->email;
-$idcompany=$user->present()->idcompany;
-$langid=$user->present()->langid;
-$privacyacc=$user->present()->privacyaccepted;
-$loginusername=$user->present()->username;
-$roleuser=$user->present()->role_id;
+$iduserlogin = $user->present()->id;
+$nameuser = $user->present()->name;
+$emailuser = $user->present()->email;
+$idcompany = $user->present()->idcompany;
+$langid = $user->present()->langid;
+$privacyacc = $user->present()->privacyaccepted;
+$loginusername = $user->present()->username;
+$roleuser = $user->present()->role_id;
 
 
 //$user = "1";
 //$iduserlogin="1";
 //$idcompany="1";
-$companyname="Company Name";
+$companyname = "Company Name";
 //$nameuser="Claudio";
 //$emailuser="info@acscreativesolutions.com";
 
@@ -41,68 +39,92 @@ $companyname="Company Name";
 ?>
 <?php require_once('../Connections/cmctrfdb.php'); ?>
 <?php require_once('../webassist/mysqli/rsobj.php'); ?>
-<?php // require_once('@@RSObjectPath@@'); ?>
+<?php // require_once('@@RSObjectPath@@'); 
+?>
 
-<?php  require_once('../webassist/mysqli/queryobj.php'); ?>
-<?php // require_once("../webassist/form_validations/wavt_scripts_php.php"); ?>
+<?php require_once('../webassist/mysqli/queryobj.php'); ?>
+<?php // require_once("../webassist/form_validations/wavt_scripts_php.php"); 
+?>
 <?php include('generalsettings.php'); ?>
 
 
-<?php 
+<?php
 if (session_status() == PHP_SESSION_NONE) {
-    session_start();
+	session_start();
 }
 
-	if (!isset($_SESSION["idowneruser"])) {
-		$_SESSION["iduserlogin"]=$iduserlogin;
-	}
-$iduserlog=$_SESSION["iduserlogin"];
-$_SESSION["nameuser"]=$nameuser;
-$_SESSION["emailuser"]=$emailuser;
+if (!isset($_SESSION["idowneruser"])) {
+	$_SESSION["iduserlogin"] = $iduserlogin;
+}
+$iduserlog = $_SESSION["iduserlogin"];
+$_SESSION["nameuser"] = $nameuser;
+$_SESSION["emailuser"] = $emailuser;
 
 if (!isset($_SESSION["tempcode"])) {
-$timestampnow=time();
-$temporarycode=$iduserlog."-".$timestampnow;
-$_SESSION["tempcode"]=$temporarycode;
-$tempcode=$_SESSION["tempcode"];
-	} else { $tempcode=$_SESSION["tempcode"]; }
+	$timestampnow = time();
+	$temporarycode = $iduserlog . "-" . $timestampnow;
+	$_SESSION["tempcode"] = $temporarycode;
+	$tempcode = $_SESSION["tempcode"];
+} else {
+	$tempcode = $_SESSION["tempcode"];
+}
 ?>
-<?php 
+<?php
 if (isset($_GET['info'])) {
-$infobox=$_GET['info'];
-$_SESSION["infobox"]=$infobox;
-} 
+	$infobox = $_GET['info'];
+	$_SESSION["infobox"] = $infobox;
+}
 if (isset($_SESSION["infobox"])) {
-	$infobox=$_SESSION["infobox"];
-	} 
+	$infobox = $_SESSION["infobox"];
+}
+?>
+<?php  // session language
+
+// If present GET 'languageselect'
+if (isset($_GET['languageselect']) && ($_GET['languageselect'] == 'it' || $_GET['languageselect'] == 'en')) {
+	$_SESSION['langselect'] = $_GET['languageselect'];
+} elseif (!isset($_SESSION['langselect'])) {
+	// Use browser  language
+	$browserLang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+
+	if ($browserLang == 'en') {
+		$_SESSION['langselect'] = 'en';
+	} else {
+		// Italian default
+		$_SESSION['langselect'] = 'it';
+	}
+}
+
+echo $_SESSION['langselect'];
 ?>
 
-
-        <?php include('languages/it/general.php');
-include('languages/it/questionaire.php'); 
+<?php
+// Include files based on the language session
+include('languages/' . $_SESSION['langselect'] . '/general.php');
+include('languages/' . $_SESSION['langselect'] . '/questionaire.php');
 ?>
 
 
 
 <!-- query languages -->
 <?php
-$langselect = new WA_MySQLi_RS("langselect",$cmctrfdb,1);
+$langselect = new WA_MySQLi_RS("langselect", $cmctrfdb, 1);
 $langselect->setQuery("SELECT * FROM languages WHERE languages.idlanguages='$langid'");
 $langselect->execute();
-$lang=$langselect->getColumnVal("acronym_languages");
+$lang = $langselect->getColumnVal("acronym_languages");
 ?>
 <?php
-$languageselection = new WA_MySQLi_RS("languageselection",$cmctrfdb,0);
+$languageselection = new WA_MySQLi_RS("languageselection", $cmctrfdb, 0);
 $languageselection->setQuery("SELECT * FROM languages WHERE languages.active_languages='Y' ORDER BY languages.name_languages");
 $languageselection->execute();
 
 
 ?>
 <?php
-$avat = new WA_MySQLi_RS("avat",$cmctrfdb,0);
+$avat = new WA_MySQLi_RS("avat", $cmctrfdb, 0);
 $avat->setQuery("SELECT avatar,id FROM auth_users WHERE auth_users.id='$iduserlogin'");
 $avat->execute();
-$avatarname=$avat->getColumnVal("avatar");
+$avatarname = $avat->getColumnVal("avatar");
 
 ?>
 <?php
@@ -110,15 +132,11 @@ $avatarname=$avat->getColumnVal("avatar");
 //$companydetails->setQuery("SELECT * FROM company WHERE company.idcompany='1'");
 //$companydetails->execute();
 if (isset($idcompany)) {
-$companydetails = mysqli_query($cmctrfdb, "SELECT * FROM company WHERE company.idcompany='$idcompany'");
-$companyData = mysqli_fetch_assoc($companydetails);
-//echo $companyData["companyname_company"];
+	$companydetails = mysqli_query($cmctrfdb, "SELECT * FROM company WHERE company.idcompany='$idcompany'");
+	$companyData = mysqli_fetch_assoc($companydetails);
+	//echo $companyData["companyname_company"];
 
-	}
+}
 //include('securitycheck.php');
 
-?>
-
-
-
-
+?>
\ No newline at end of file
diff --git a/public/languages/en/general.php b/public/languages/en/general.php
index a6b567d..7991ef3 100644
--- a/public/languages/en/general.php
+++ b/public/languages/en/general.php
@@ -339,3 +339,10 @@ $certd_1 = "Initial certification";
 $certd_2 = "Annual certification surveillance";
 $certd_3 = "Renewal";
 $certd_4 = "Extension";
+$certtotesttitle = "I have a certificate to test:";
+$formetitle = "For me";
+$foranotherclienttitle = "For another client";
+$uploadCompanyLogoTitle = "Upload Company Logo";
+$selectImageToUploadTitle = "Select the image to upload (only JPG, JPEG, PNG):";
+$uploadButtonTitle = "Upload";
+$companyLogoAltTitle = "Company Logo";
diff --git a/public/languages/it/general.php b/public/languages/it/general.php
index 9bac04a..fd44ce1 100644
--- a/public/languages/it/general.php
+++ b/public/languages/it/general.php
@@ -343,3 +343,10 @@ $certd_1 = "Certificazione iniziale";
 $certd_2 = "Sorveglianza annuale";
 $certd_3 = "Rinnovo";
 $certd_4 = "Estensione";
+$certtotesttitle = "Ho un certificato da testare:";
+$formetitle = "Per me";
+$foranotherclienttitle = "Per un altro cliente";
+$uploadCompanyLogoTitle = "Carica Logo Aziendale";
+$selectImageToUploadTitle = "Seleziona l'immagine da caricare (solo JPG, JPEG, PNG):";
+$uploadButtonTitle = "Carica";
+$companyLogoAltTitle = "Logo Aziendale";
diff --git a/public/pdf/996rev0applicationform20240925092217.pdf b/public/pdf/996rev0applicationform20240925092217.pdf
new file mode 100644
index 0000000..7d8ab10
Binary files /dev/null and b/public/pdf/996rev0applicationform20240925092217.pdf differ
diff --git a/public/pdf/996rev0applicationformb20240925092217.pdf b/public/pdf/996rev0applicationformb20240925092217.pdf
new file mode 100644
index 0000000..4b0378c
Binary files /dev/null and b/public/pdf/996rev0applicationformb20240925092217.pdf differ
diff --git a/public/trfoption.php b/public/trfoption.php
index 4770712..310f5f5 100644
--- a/public/trfoption.php
+++ b/public/trfoption.php
@@ -229,20 +229,20 @@ $conn->close();
                         <!-- card for optional TRF -->
                         <div class="card">
                             <div class="card-body">
-                                <h4 class="mt-0 header-title">Ho un certificato da testare:</h4>
+                                <h4 class="mt-0 header-title"><?php echo $certtotesttitle; ?></h4>
                                 <p class="text-muted mb-3"><?php echo $addparameterstitle_help; ?></p>
                                 <form id="otherclientForm" action="" method="POST">
                                     <div class="col-md-9">
                                         <div class="my-2">
                                             <div class="custom-control custom-radio">
                                                 <input type="radio" id="customRadio3" name="customRadio" class="custom-control-input" value="N" <?php if ($otherclient == 'N') echo 'checked'; ?>>
-                                                <label class="custom-control-label" for="customRadio3">Per me</label>
+                                                <label class="custom-control-label" for="customRadio3"><?php echo $formetitle; ?></label>
                                             </div>
                                         </div>
                                         <div class="my-2">
                                             <div class="custom-control custom-radio">
                                                 <input type="radio" id="customRadio4" name="customRadio" class="custom-control-input" value="Y" <?php if ($otherclient == 'Y') echo 'checked'; ?>>
-                                                <label class="custom-control-label" for="customRadio4">Per un mio cliente</label>
+                                                <label class="custom-control-label" for="customRadio4"><?php echo $foranotherclienttitle; ?></label>
                                             </div>
                                         </div>
                                         <input type="hidden" id="idtrf" name="idtrf" class="custom-control-input" value='<?php echo $idtrf; ?>'>