diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm
index a29cb27..65b6a54 100755
--- a/copri4/main/src/Mod/APIfunc.pm
+++ b/copri4/main/src/Mod/APIfunc.pm
@@ -1760,7 +1760,7 @@ sub bikes_available(){
     }
   }
 
-   my $td_template = $dbt->tariff_description2_template();
+   my $td_template = $dbt->rental_description_template();
 
    foreach my $id (sort { $record->{$a}->{barcode} <=> $record->{$b}->{barcode} } keys (%$record)){
 	   $return->{$id}->{authed} = "$authed";
@@ -1810,11 +1810,11 @@ sub bikes_available(){
 		#TODO, have to be set on Tarif table
 		$return->{$id}->{tariff_description}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)." if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
 
-          	#new tariff_description2
-          	$return->{$id}->{tariff_description2}->{name} = "$tariff_content->{$tid}->{ct_name}";
-          	$return->{$id}->{tariff_description2}->{number} = "$tariff_content->{$tid}->{barcode}";
-          	$return->{$id}->{tariff_description2}->{track_info} = "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!" if($record->{$id}->{int25});
-          	$return->{$id}->{tariff_description2}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)." if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
+          	#new rental_description
+          	$return->{$id}->{rental_description}->{name} = "$tariff_content->{$tid}->{ct_name}";
+          	$return->{$id}->{rental_description}->{id} = "$tariff_content->{$tid}->{barcode}";
+          	$return->{$id}->{rental_description}->{rental_info}->{1} = ["Tracking","Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"] if($record->{$id}->{int25});
+          	$return->{$id}->{rental_description}->{rental_info}->{2} = ["AGB","Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."] if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
 
           	my $i = 0;
           	foreach my $td (sort keys (%$td_template)){
@@ -1823,19 +1823,19 @@ sub bikes_available(){
            if($td_template->{$td}->{int35} && $tariff_content->{$tid}->{int35} && $tariff_content->{$tid}->{int35} > 0){
             $tariff_content->{$tid}->{int35} =~ s/\./,/;
             $time_unit = $dbt->time_format($tariff_content->{$tid}->{time01});
-            $return->{$id}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int35}","$tariff_content->{$tid}->{int35} € / $time_unit"];
+            $return->{$id}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int35}","$tariff_content->{$tid}->{int35} € / $time_unit"];
            }elsif($td_template->{$td}->{int36} && $tariff_content->{$tid}->{int36} && $tariff_content->{$tid}->{int36} > 0){
             $tariff_content->{$tid}->{int36} =~ s/\./,/;
             $time_unit = $dbt->time_format($tariff_content->{$tid}->{time01});
-            $return->{$id}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int36}", "$tariff_content->{$tid}->{int36} € / $time_unit"];
+            $return->{$id}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int36}", "$tariff_content->{$tid}->{int36} € / $time_unit"];
            }elsif($td_template->{$td}->{int17} && $tariff_content->{$tid}->{int17} && $tariff_content->{$tid}->{int17} > 0){
 		   #$tariff_content->{$tid}->{int17} =~ s/\./,/;
-            $return->{$id}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int17}","$tariff_content->{$tid}->{int17} € / Tag"];
+            $return->{$id}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int17}","$tariff_content->{$tid}->{int17} € / Tag"];
            }elsif($td_template->{$td}->{time02} && $tariff_content->{$tid}->{time02} =~ /[1-9]/){
             $time_unit = $dbt->time_format($tariff_content->{$tid}->{time02});
-            $return->{$id}->{tariff_description2}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
+            $return->{$id}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
            }
-          	}#end new tariff_description2
+          	}#end new rental_description
 
 	       }
 	      }
diff --git a/copri4/main/src/Mod/APIsigoclient.pm b/copri4/main/src/Mod/APIsigoclient.pm
index 96928ba..34edee6 100755
--- a/copri4/main/src/Mod/APIsigoclient.pm
+++ b/copri4/main/src/Mod/APIsigoclient.pm
@@ -78,7 +78,7 @@ sub sigo_available {
           c_id   => "1",
  };
  my $hotline_data = $dbt->fetch_record($dbh,$hotline_hash);
- my $td_template = $dbt->tariff_description2_template();
+ my $td_template = $dbt->rental_description_template();
 
  open(FILE,">>$varenv->{logdir}/APIsigo_client.log");
  print FILE "\n*** $now_dt 'sigo_available' \n";
@@ -190,7 +190,7 @@ sub sigo_available {
 	  $response_out->{$bike}->{bike_group} = ["SX300102"];#E-Lastenrad
 	  $response_out->{$bike}->{unlock_allowed} = "1";
 	  $response_out->{$bike}->{tariff_description} = {};
-	  $response_out->{$bike}->{tariff_description2} = {};
+	  $response_out->{$bike}->{rental_description} = {};
 	  if(ref($tariff_content) eq "HASH"){
              foreach my $tid (sort { $tariff_content->{$a}->{barcode} <=> $tariff_content->{$b}->{barcode} } keys (%$tariff_content)){
 		#deprecated
@@ -202,11 +202,11 @@ sub sigo_available {
                 $response_out->{$bike}->{tariff_description}->{abo_eur_per_month} = "$tariff_content->{$tid}->{int15}" if($tariff_content->{$tid}->{int15});
                 $response_out->{$bike}->{tariff_description}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber <a href='$dbt->{operator}->{$varenv->{dbname}}->{operatorApp}/site/agb.html' target='_blank'>AGB</a> zugestimmt (Demo)." if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
 
-                #new tariff_description2
-                $response_out->{$bike}->{tariff_description2}->{name} = "$tariff_content->{$tid}->{ct_name}";
-                $response_out->{$bike}->{tariff_description2}->{number} = "$tariff_content->{$tid}->{barcode}";
-                $response_out->{$bike}->{tariff_description2}->{track_info} = "Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!";# if($record->{$id}->{int25});
-                $response_out->{$bike}->{tariff_description2}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)." if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
+                #new rental_description
+                $response_out->{$bike}->{rental_description}->{name} = "$tariff_content->{$tid}->{ct_name}";
+                $response_out->{$bike}->{rental_description}->{id} = "$tariff_content->{$tid}->{barcode}";
+                $response_out->{$bike}->{rental_description}->{rental_info}->{1} = ["Tracking","Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"];#TODO if($resp->{gps_tracker_id});
+                $response_out->{$bike}->{rental_description}->{rental_info}->{2} = ["AGB","Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."] if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262));
 
                 my $i = 0;
                 foreach my $td (sort keys (%$td_template)){
@@ -214,19 +214,19 @@ sub sigo_available {
 		 if($td_template->{$td}->{int35} && $tariff_content->{$tid}->{int35} && $tariff_content->{$tid}->{int35} > 0){
 		  $tariff_content->{$tid}->{int35} =~ s/\./,/;
                   $time_unit = $dbt->time_format($tariff_content->{$tid}->{time01});
-                  $response_out->{$bike}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int35}","$tariff_content->{$tid}->{int35} € / $time_unit"];
+                  $response_out->{$bike}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int35}","$tariff_content->{$tid}->{int35} € / $time_unit"];
 		 }elsif($td_template->{$td}->{int36} && $tariff_content->{$tid}->{int36} && $tariff_content->{$tid}->{int36} > 0){
 		  $tariff_content->{$tid}->{int36} =~ s/\./,/;
 		  $time_unit = $dbt->time_format($tariff_content->{$tid}->{time01});
-                  $response_out->{$bike}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int36}", "$tariff_content->{$tid}->{int36} € / $time_unit"];
+                  $response_out->{$bike}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int36}", "$tariff_content->{$tid}->{int36} € / $time_unit"];
 		 }elsif($td_template->{$td}->{int17} && $tariff_content->{$tid}->{int17} && $tariff_content->{$tid}->{int17} > 0){
 		  $tariff_content->{$tid}->{int17} =~ s/\./,/;
-                  $response_out->{$bike}->{tariff_description2}->{$td} = ["$td_template->{$td}->{int17}","$tariff_content->{$tid}->{int17} € / Tag"];
+                  $response_out->{$bike}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int17}","$tariff_content->{$tid}->{int17} € / Tag"];
 		 }elsif($td_template->{$td}->{time02} && $tariff_content->{$tid}->{time02} =~ /[1-9]/){
                   $time_unit = $dbt->time_format($tariff_content->{$tid}->{time02});
-                  $response_out->{$bike}->{tariff_description2}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
+                  $response_out->{$bike}->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
                  }
-                }#end new tariff_description2
+                }#end new rental_description
 
 	     }
 	  }
@@ -236,6 +236,7 @@ sub sigo_available {
           $return2copri->{$bike}->{txt22} = $resp->{id};#sig bikeId like 380116b5-0522-43da-ab66-477744a731a3
           $return2copri->{$bike}->{int04} = $1 if($response_out->{$bike}->{station} =~ /(\d+)/);
           $return2copri->{$bike}->{txt01} = "$response_out->{$bike}->{description}";
+          $return2copri->{$bike}->{int25} = "1" if($resp->{gps_tracker_id});
           $return2copri->{$bike}->{txt06} = "$response_out->{$bike}->{gps}->{latitude},$response_out->{$bike}->{gps}->{longitude}";
           $return2copri->{$bike}->{int19} = $1 if($response_out->{$bike}->{bike_charge} =~ /(\d+)/);
 	  while (my ($key, $value) = each %{ $dbt->{copri_conf}->{bike_state} }) {
diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm
index 5999e4b..c09660d 100755
--- a/copri4/main/src/Mod/DBtank.pm
+++ b/copri4/main/src/Mod/DBtank.pm
@@ -1239,7 +1239,7 @@ sub get_freetpl(){
 }
 #
 
-sub tariff_description2_template {
+sub rental_description_template {
  my $self = shift;
  my $tpl_order = {
 	 1 => {int35 => "Mietgebühr"},#unit_price1
diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm
index 9ce4347..a218160 100755
--- a/copri4/main/src/Mod/Pricing.pm
+++ b/copri4/main/src/Mod/Pricing.pm
@@ -295,7 +295,7 @@ sub fetch_rentalfeed {
  my $ctpos = shift;
  my $returned_counting = shift || {};
    
- my $td_template = $dbt->tariff_description2_template();
+ my $td_template = $dbt->rental_description_template();
  my $bike_group = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$ctpos->{int12}" || "";
 
  my $return = {};
@@ -325,34 +325,34 @@ sub fetch_rentalfeed {
           $return->{tariff_description}->{free_hours} = "$ctpos->{int16}" if($ctpos->{int16} && $ctpos->{int16} > 0);
           $return->{tariff_description}->{abo_eur_per_month} = "$ctpos->{int15}" if($ctpos->{int15} && $ctpos->{int15} > 0);
 
-	  #new tariff_description2
-          $return->{tariff_description2}->{name} = "$ctpos->{txt04}";
-          $return->{tariff_description2}->{number} = "$ctpos->{int09}";
+	  #new rental_description
+          $return->{rental_description}->{name} = "$ctpos->{txt04}";
+          $return->{rental_description}->{id} = "$ctpos->{int09}";
 
 	  foreach my $td (sort keys (%$td_template)){
 	   my $time_unit = "";
 	   if($td_template->{$td}->{int35} && $ctpos->{int35} && $ctpos->{int35} > 0){
 	    $ctpos->{int35} =~ s/\./,/;
 	    $time_unit = $dbt->time_format($ctpos->{time01}); 
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{int35}","$ctpos->{int35} € / $time_unit"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int35}","$ctpos->{int35} € / $time_unit"];
 	   }elsif($td_template->{$td}->{int36} && $ctpos->{int36} && $ctpos->{int36} > 0){
 	    $ctpos->{int36} =~ s/\./,/;
 	    $time_unit = $dbt->time_format($ctpos->{time01}); 
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{int36}", "$ctpos->{int36} € / $time_unit"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int36}", "$ctpos->{int36} € / $time_unit"];
 	   }elsif($td_template->{$td}->{int17} && $ctpos->{int17} && $ctpos->{int17} > 0){
 	    $ctpos->{int17} =~ s/\./,/;
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{int17}","$ctpos->{int17} € / Tag"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int17}","$ctpos->{int17} € / Tag"];
 	   }elsif($td_template->{$td}->{time02} && $ctpos->{time02} =~ /[1-9]/){
 	    $time_unit = $dbt->time_format($ctpos->{time02}); 
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit / Tag"];
 	   }elsif($td_template->{$td}->{xduration} && $returned_counting->{real_clock} && $returned_counting->{real_clock} =~ /[1-9]/){
 	    $time_unit = $dbt->time_format($returned_counting->{real_clock}); 
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{xduration}","$time_unit"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{xduration}","$time_unit"];
 	   }elsif($td_template->{$td}->{xprice} && $returned_counting->{total_price} && $returned_counting->{total_price} > 0){
 	    $returned_counting->{total_price} =~ s/\./,/;
-            $return->{tariff_description2}->{$td} = ["$td_template->{$td}->{xprice}","$returned_counting->{total_price} €"];
+            $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{xprice}","$returned_counting->{total_price} €"];
 	   }
- 	  }#end new tariff_description2
+ 	  }#end new rental_description
 
 	  $return->{Ilockit_ID} = "$ctpos->{txt18}" if($ctpos->{int11} == 2);
 	  ($return->{gps}->{latitude},$return->{gps}->{longitude}) = split(/,/,$ctpos->{txt06});
diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm
index 17ed3d4..e62c88a 100755
--- a/copri4/main/src/Mod/Printpreview.pm
+++ b/copri4/main/src/Mod/Printpreview.pm
@@ -492,9 +492,9 @@ td {
         if($key =~ /int02/){
           if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
             print "<td class='tdint' nowrap>\n";
-            foreach my $fid (sort keys(%{ $rental_feed->{tariff_description2} })){
-              if(ref($rental_feed->{tariff_description2}->{$fid}) eq "ARRAY"){
-                print "$rental_feed->{tariff_description2}->{$fid}[0]: $rental_feed->{tariff_description2}->{$fid}[1]<br />\n";
+            foreach my $fid (sort keys(%{ $rental_feed->{rental_description}->{tarif_elements} })){
+              if(ref($rental_feed->{rental_description}->{tarif_elements}->{$fid}) eq "ARRAY"){
+                print "$rental_feed->{rental_description}->{tarif_elements}->{$fid}[0]: $rental_feed->{rental_description}->{tarif_elements}->{$fid}[1]<br />\n";
               }
             }
             print "</td>\n";
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index 6089254..e676323 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -266,10 +266,9 @@ EOF
 	}elsif($key =~ /int02/){
 	  if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
 	    print "<td class='tdint'>\n";
-	    #print "Tarif: $rental_feed->{tariff_description2}->{number} $rental_feed->{tariff_description2}->{name}<br />\n";
-	    foreach my $fid (sort keys(%{ $rental_feed->{tariff_description2} })){
-	      if(ref($rental_feed->{tariff_description2}->{$fid}) eq "ARRAY"){
-		print "$rental_feed->{tariff_description2}->{$fid}[0]: $rental_feed->{tariff_description2}->{$fid}[1]<br />\n";
+	    foreach my $fid (sort keys(%{ $rental_feed->{rental_description}->{tarif_elements} })){
+	      if(ref($rental_feed->{rental_description}->{tarif_elements}->{$fid}) eq "ARRAY"){
+		print "$rental_feed->{rental_description}->{tarif_elements}->{$fid}[0]: $rental_feed->{rental_description}->{tarif_elements}->{$fid}[1]<br />\n";
 	      }
 	    }
 	    print "</td>\n";
@@ -357,9 +356,9 @@ EOF
 	}elsif($key =~ /int02/){
 	  if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
 	    print "<td class='tdint'>\n";
-	    foreach my $fid (sort keys(%{ $rental_feed->{tariff_description2} })){
-	      if(ref($rental_feed->{tariff_description2}->{$fid}) eq "ARRAY"){
-		print "$rental_feed->{tariff_description2}->{$fid}[0]: $rental_feed->{tariff_description2}->{$fid}[1]<br />\n";
+	    foreach my $fid (sort keys(%{ $rental_feed->{rental_description}->{tarif_elements} })){
+	      if(ref($rental_feed->{rental_description}->{tarif_elements}->{$fid}) eq "ARRAY"){
+		print "$rental_feed->{rental_description}->{tarif_elements}->{$fid}[0]: $rental_feed->{rental_description}->{tarif_elements}->{$fid}[1]<br />\n";
 	      }
 	    }
 	    print "</td>\n";