diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index 0840a6c7931bbaaea54734e363406ca0b58108d1..a0ac53b8e01598299113ecdd0b57130d2775ba57 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -343,35 +343,25 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
 			);
 			_Xelement.AddIfContentNotNull(new XElement(_defaultNamespace + XMLNames.Vehicle_NgTankSystem, _inputData.TankSystem));
 
-			if (_inputData.NumberPassengerSeatsUpperDeck != null &&
-				_inputData.NumberPassengerSeatsLowerDeck != null &&
-				_inputData.NumberPassengersStandingUpperDeck != null &&
-				_inputData.NumberPassengersStandingLowerDeck != null) 
-			{
-				// ReSharper disable once CoVariantArrayConversion
-				_Xelement.Add(_groupWriterFactory.GetVehicleDeclarationGroupWriter(
-					GroupNames.Vehicle_CompletedBus_PassengerCountSequenceGroup, _defaultNamespace).GetGroupElements(_inputData));
-			}
+			// ReSharper disable once CoVariantArrayConversion
+			_Xelement.Add(_groupWriterFactory.GetVehicleDeclarationGroupWriter(
+				GroupNames.Vehicle_CompletedBus_PassengerCountSequenceGroup, _defaultNamespace).GetGroupElements(_inputData));
 
 			_Xelement.AddIfContentNotNull(new XElement(_defaultNamespace + XMLNames.Vehicle_BodyworkCode, _inputData.VehicleCode.ToXMLFormat()));
 			_Xelement.AddIfContentNotNull(new XElement(_defaultNamespace + XMLNames.Bus_LowEntry, _inputData.LowEntry));
 
-			if (_inputData.Height != null && 
-				_inputData.Length != null &&
-				_inputData.Width != null &&
-				_inputData.EntranceHeight != null) {
-				// ReSharper disable once CoVariantArrayConversion
-				_Xelement.Add(_groupWriterFactory.GetVehicleDeclarationGroupWriter(
-						GroupNames.Vehicle_CompletedBus_DimensionsSequenceGroup, _defaultNamespace)
-					.GetGroupElements(_inputData));
-			}
+
+			_Xelement.Add(_groupWriterFactory.GetVehicleDeclarationGroupWriter(
+					GroupNames.Vehicle_CompletedBus_DimensionsSequenceGroup, _defaultNamespace)
+				.GetGroupElements(_inputData));
 
 			_Xelement.AddIfContentNotNull(new XElement(_defaultNamespace + XMLNames.BusAux_PneumaticSystem_DoorDriveTechnology,
-				_inputData.DoorDriveTechnology != null
-					? _inputData.DoorDriveTechnology.ToXMLFormat()
-					: null));
+			_inputData.DoorDriveTechnology != null
+				? _inputData.DoorDriveTechnology.ToXMLFormat()
+				: null));
 
 			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_VehicleDeclarationType, _inputData.VehicleDeclarationType));
+			_Xelement.AddIfContentNotNull(new XElement(_defaultNamespace + XMLNames.VehicleTypeApprovalNumber, _inputData.VehicleTypeApprovalNumber));
 
 			if (_inputData.ADAS != null) {
 				_Xelement.Add(_componentWriterFactory.getDeclarationAdasWriter(GroupNames.ADAS_Conventional_Type, _defaultNamespace).GetComponent(_inputData.ADAS));
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 109368cf097c4d46ba9f688b876bc1beace6bdb7..43e4465b4209f77b57b67825f0b1091197b898d9 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -265,6 +265,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				nameof(EcoRollTypeNullable),
 				nameof(PredictiveCruiseControlNullable),
 				nameof(ATEcoRollReleaseLockupClutch),
+				nameof(VehicleTypeApprovalNumber),
 			};
 
 			foreach (var property in properties) {
@@ -430,6 +431,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			EntranceHeight = vehicleInputData.EntranceHeight;
 			DoorDriveTechnology = vehicleInputData.DoorDriveTechnology;
 			VehicleDeclarationType = vehicleInputData.VehicleDeclarationType;
+			VehicleTypeApprovalNumber = vehicleInputData.VehicleTypeApprovalNumber;
 			AdasEditingEnabled = vehicleInputData.ADAS != null;
 			EngineStopStartNullable = vehicleInputData.ADAS?.EngineStopStart;
 			EcoRollTypeNullable = vehicleInputData.ADAS?.EcoRoll;
@@ -806,7 +808,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set => SetProperty(ref _vehicleDeclarationType, value);
 		}
 
-		public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+		private string _vehicleTypeApprovalNumber;
+
+		public string VehicleTypeApprovalNumber
+		{
+			get => _vehicleTypeApprovalNumber;
+			set => SetProperty(ref _vehicleTypeApprovalNumber, value);
+		}
 
 		#endregion
 
diff --git a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
index dbcc83e32f87775084977303132fb13927eb73c6..5ab3c287ff37bc763317d7311cf26db0d70c688b 100644
--- a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
+++ b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
@@ -111,6 +111,7 @@
                 <ContentControl 
                     Content="{Binding ParameterViewModels[VehicleDeclarationType]}"/>
 
+                <ContentControl Content="{Binding ParameterViewModels[VehicleTypeApprovalNumber]}"/>
                     <Label Content="Advanced Driver Assistant Systems" Style="{DynamicResource LabelStyle1}"/>
 
                 <ContentControl