diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 8505010b..5a388b11 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -181,235 +181,237 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					+ "</ram:IncludedCINote>\n";
 			
 		}
-		String xml= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
-
-				+ "<rsm:CrossIndustryInvoice xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:13\""
-//				+ " xsi:schemaLocation=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:13 ../Schema/ZUGFeRD1p0.xsd\""
-				+ " xmlns:ram=\"urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:20\""
-				+ " xmlns:udt=\"urn:un:unece:uncefact:data:standard:UnqualifiedDataType:20\">\n" //$NON-NLS-1$
-				+ "	<rsm:CIExchangedDocumentContext>\n" //$NON-NLS-1$
-				+ "		\n" //$NON-NLS-1$
-				+ "		<ram:GuidelineSpecifiedCIDocumentContextParameter>\n" //$NON-NLS-1$
-				+ "			<ram:ID>urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended</ram:ID>\n" //$NON-NLS-1$
-				+ "		</ram:GuidelineSpecifiedCIDocumentContextParameter>\n" //$NON-NLS-1$
-				+ "	</rsm:CIExchangedDocumentContext>\n" //$NON-NLS-1$
-				+ "	<rsm:CIIHExchangedDocument>\n" //$NON-NLS-1$
-				+ "		<ram:ID>"+trans.getNumber()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "		<ram:Name>RECHNUNG</ram:Name>\n" //$NON-NLS-1$
-				+ "		<ram:TypeCode>380</ram:TypeCode>\n" //$NON-NLS-1$
-				+ "		<ram:IssueDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getIssueDate())+"</udt:DateTimeString></ram:IssueDateTime>\n" //date format was 20130605 //$NON-NLS-1$ //$NON-NLS-2$
-				+ senderReg
-//				+ "		<IncludedNote>\n"
-//				+ "			<Content>\n"
-//				+ "Rechnung gemäß Bestellung Nr. 2013-471331 vom 01.03.2013.\n"
-//				+ "\n"
-//				+ "      </Content>\n"
-//				+ "      </IncludedNote>\n"
-//				+ "      <IncludedNote>\n"
-//				+ "			<Content>\n"
-//				+ "Es bestehen Rabatt- und Bonusvereinbarungen.\n"
-//				+ "			</Content>\n"
-//				+ "			<SubjectCode>AAK</SubjectCode>\n"
-//				+ "		</IncludedNote>\n"
-				+ "	</rsm:CIIHExchangedDocument>\n" //$NON-NLS-1$
-				+ "	<rsm:CIIHSupplyChainTradeTransaction>\n" //$NON-NLS-1$
-				+ "		<ram:ApplicableCIIHSupplyChainTradeAgreement>\n" //$NON-NLS-1$
-//				+ "			<BuyerReference>AB-312</BuyerReference>\n"
-				+ "			<ram:SellerCITradeParty>\n" //$NON-NLS-1$
-//				+ "				<GlobalID schemeID=\"0088\">4000001123452</GlobalID>\n"
-				+ "				<ram:Name>"+trans.getOwnOrganisationName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				<ram:PostalCITradeAddress>\n"
-				+ "					<ram:PostcodeCode>"+trans.getOwnZIP()+"</ram:PostcodeCode>\n"
-				+ "					<ram:LineOne>"+trans.getOwnStreet()+"</ram:LineOne>\n"
-				+ "					<ram:CityName>"+trans.getOwnLocation()+"</ram:CityName>\n"
-				+ "					<ram:CountryID>"+trans.getOwnCountry()+"</ram:CountryID>\n"
-				+ "				</ram:PostalCITradeAddress>\n"
-				+ "				<ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "					<ram:ID schemeID=\"FC\">"+trans.getOwnTaxID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "				<ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "					<ram:ID schemeID=\"VA\">"+trans.getOwnVATID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "			</ram:SellerCITradeParty>\n" //$NON-NLS-1$
-				+ "			<ram:BuyerCITradeParty>\n" //$NON-NLS-1$
-//				+ "				<ID>GE2020211</ID>\n"
-//				+ "				<GlobalID schemeID=\"0088\">4000001987658</GlobalID>\n"
-				+ "				<ram:Name>"+trans.getRecipient().getName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
-//				+ "				<DefinedTradeContact>\n"
-//				+ "					<PersonName>xxx</PersonName>\n"
-//				+ "				</DefinedTradeContact>\n"
-				+ "				<ram:PostalCITradeAddress>\n" //$NON-NLS-1$
-				+ "					<ram:PostcodeCode>"+trans.getRecipient().getZIP()+"</ram:PostcodeCode>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "					<ram:LineOne>"+trans.getRecipient().getStreet()+"</ram:LineOne>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "					<ram:CityName>"+trans.getRecipient().getLocation()+"</ram:CityName>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "					<ram:CountryID>"+trans.getRecipient().getCountry()+"</ram:CountryID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:PostalCITradeAddress>\n" //$NON-NLS-1$
-				+ "				<ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "					<ram:ID schemeID=\"VA\">"+trans.getRecipient().getVATID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:SpecifiedCITaxRegistration>\n" //$NON-NLS-1$
-				+ "			</ram:BuyerCITradeParty>\n" //$NON-NLS-1$
-//				+ "			<BuyerOrderReferencedDocument>\n"
-//				+ "				<IssueDateTime format=\"102\">20130301</IssueDateTime>\n"
-//				+ "			<ID>2013-471331</ID>\n"
-//				+ "			</BuyerOrderReferencedDocument>\n"
-				+ "		</ram:ApplicableCIIHSupplyChainTradeAgreement>\n" //$NON-NLS-1$
-				+ "		<ram:ApplicableCIIHSupplyChainTradeDelivery>\n"
-				+ "			<ram:ActualDeliveryCISupplyChainEvent>\n"
-				+ "				<ram:OccurrenceDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getDeliveryDate())+"</udt:DateTimeString></ram:OccurrenceDateTime>\n"
-				+ "			</ram:ActualDeliveryCISupplyChainEvent>\n"
-				/*
-				+ "			<DeliveryNoteReferencedDocument>\n"
-				+ "				<IssueDateTime format=\"102\">20130603</IssueDateTime>\n"
-				+ "				<ID>2013-51112</ID>\n"
-				+ "			</DeliveryNoteReferencedDocument>\n" */
-				+ "		</ram:ApplicableCIIHSupplyChainTradeDelivery>\n"
-				+ "		<ram:ApplicableCIIHSupplyChainTradeSettlement>\n" //$NON-NLS-1$
-				+ "			<ram:PaymentReference>"+trans.getNumber()+"</ram:PaymentReference>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "			<ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>\n" //$NON-NLS-1$
-				+ "			<ram:SpecifiedCITradeSettlementPaymentMeans>\n" //$NON-NLS-1$
-				+ "				<ram:TypeCode>42</ram:TypeCode>\n" //$NON-NLS-1$
-				+ "				<ram:Information>Überweisung</ram:Information>\n" //$NON-NLS-1$
-				+ "				<ram:PayeePartyCICreditorFinancialAccount>\n" //$NON-NLS-1$
-				+ "					<ram:IBANID>"+trans.getOwnIBAN()+"</ram:IBANID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:PayeePartyCICreditorFinancialAccount>\n" //$NON-NLS-1$
-				+ "				<ram:PayeeSpecifiedCICreditorFinancialInstitution>\n" //$NON-NLS-1$
-				+ "					<ram:BICID>"+trans.getOwnBIC()+"</ram:BICID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "					<ram:Name>"+trans.getOwnBankName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				</ram:PayeeSpecifiedCICreditorFinancialInstitution>\n" //$NON-NLS-1$
-				+ "			</ram:SpecifiedCITradeSettlementPaymentMeans>\n"; //$NON-NLS-1$
-
-
 		
-		HashMap<BigDecimal, VATAmount> VATPercentAmountMap=getVATPercentAmountMap();
-		for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
-			VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
-			if (amount != null) {
-				xml += "			<ram:ApplicableCITradeTax>\n" //$NON-NLS-1$
-								+ "				<ram:CalculatedAmount currencyID=\"EUR\">"+currencyFormat(amount.getCalculated())+"</ram:CalculatedAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-								+ "				<ram:TypeCode>VAT</ram:TypeCode>\n" //$NON-NLS-1$
-								+ "				<ram:BasisAmount currencyID=\"EUR\">"+currencyFormat(amount.getBasis())+"</ram:BasisAmount>\n"
-								+ "				<ram:CategoryCode>S</ram:CategoryCode>\n" //$NON-NLS-1$
-								+ "				<ram:RateApplicablePercent>"+vatFormat(currentTaxPercent)+"</ram:RateApplicablePercent>\n" //$NON-NLS-1$
-								+ "			</ram:ApplicableCITradeTax>\n"; //$NON-NLS-1$
+				String xml= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
+
+					+ "<rsm:CrossIndustryDocument xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:ferd:CrossIndustryDocument:invoice:1p0\""
+//					+ " xsi:schemaLocation=\"urn:ferd:CrossIndustryDocument:invoice:1p0 ../Schema/ZUGFeRD1p0.xsd\""
+					+ " xmlns:ram=\"urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12\""
+					+ " xmlns:udt=\"urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15\">\n" //$NON-NLS-1$
+					+ "	<rsm:SpecifiedExchangedDocumentContext>\n" //$NON-NLS-1$
+					+ "		<ram:TestIndicator><udt:Indicator>"+testBooleanStr+"</udt:Indicator></ram:TestIndicator>\n" //$NON-NLS-1$
+					+ "		<ram:GuidelineSpecifiedDocumentContextParameter>\n" //$NON-NLS-1$
+					+ "			<ram:ID>urn:ferd:CrossIndustryDocument:invoice:1p0:comfort</ram:ID>\n" //$NON-NLS-1$
+					+ "		</ram:GuidelineSpecifiedDocumentContextParameter>\n" //$NON-NLS-1$
+					+ "	</rsm:SpecifiedExchangedDocumentContext>\n" //$NON-NLS-1$
+					+ "	<rsm:HeaderExchangedDocument>\n" //$NON-NLS-1$
+					+ "		<ram:ID>"+trans.getNumber()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "		<ram:Name>RECHNUNG</ram:Name>\n" //$NON-NLS-1$
+					+ "		<ram:TypeCode>380</ram:TypeCode>\n" //$NON-NLS-1$
+					+ "		<ram:IssueDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getIssueDate())+"</udt:DateTimeString></ram:IssueDateTime>\n" //date format was 20130605 //$NON-NLS-1$ //$NON-NLS-2$
+					+ senderReg
+//					+ "		<IncludedNote>\n"
+//					+ "			<Content>\n"
+//					+ "Rechnung gemäß Bestellung Nr. 2013-471331 vom 01.03.2013.\n"
+//					+ "\n"
+//					+ "      </Content>\n"
+//					+ "      </IncludedNote>\n"
+//					+ "      <IncludedNote>\n"
+//					+ "			<Content>\n"
+//					+ "Es bestehen Rabatt- und Bonusvereinbarungen.\n"
+//					+ "			</Content>\n"
+//					+ "			<SubjectCode>AAK</SubjectCode>\n"
+//					+ "		</IncludedNote>\n"
+					+ "	</rsm:HeaderExchangedDocument>\n" //$NON-NLS-1$
+					+ "	<rsm:SpecifiedSupplyChainTradeTransaction>\n" //$NON-NLS-1$
+					+ "		<ram:ApplicableSupplyChainTradeAgreement>\n" //$NON-NLS-1$
+//					+ "			<BuyerReference>AB-312</BuyerReference>\n"
+					+ "			<ram:SellerTradeParty>\n" //$NON-NLS-1$
+//					+ "				<GlobalID schemeID=\"0088\">4000001123452</GlobalID>\n"
+					+ "				<ram:Name>"+trans.getOwnOrganisationName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				<ram:PostalTradeAddress>\n"
+					+ "					<ram:PostcodeCode>"+trans.getOwnZIP()+"</ram:PostcodeCode>\n"
+					+ "					<ram:LineOne>"+trans.getOwnStreet()+"</ram:LineOne>\n"
+					+ "					<ram:CityName>"+trans.getOwnLocation()+"</ram:CityName>\n"
+					+ "					<ram:CountryID>"+trans.getOwnCountry()+"</ram:CountryID>\n"
+					+ "				</ram:PostalTradeAddress>\n"
+					+ "				<ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "					<ram:ID schemeID=\"FC\">"+trans.getOwnTaxID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "				<ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "					<ram:ID schemeID=\"VA\">"+trans.getOwnVATID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "			</ram:SellerTradeParty>\n" //$NON-NLS-1$
+					+ "			<ram:BuyerTradeParty>\n" //$NON-NLS-1$
+//					+ "				<ID>GE2020211</ID>\n"
+//					+ "				<GlobalID schemeID=\"0088\">4000001987658</GlobalID>\n"
+					+ "				<ram:Name>"+trans.getRecipient().getName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
+//					+ "				<DefinedTradeContact>\n"
+//					+ "					<PersonName>xxx</PersonName>\n"
+//					+ "				</DefinedTradeContact>\n"
+					+ "				<ram:PostalTradeAddress>\n" //$NON-NLS-1$
+					+ "					<ram:PostcodeCode>"+trans.getRecipient().getZIP()+"</ram:PostcodeCode>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:LineOne>"+trans.getRecipient().getStreet()+"</ram:LineOne>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:CityName>"+trans.getRecipient().getLocation()+"</ram:CityName>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:CountryID>"+trans.getRecipient().getCountry()+"</ram:CountryID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:PostalTradeAddress>\n" //$NON-NLS-1$
+					+ "				<ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "					<ram:ID schemeID=\"VA\">"+trans.getRecipient().getVATID()+"</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:SpecifiedTaxRegistration>\n" //$NON-NLS-1$
+					+ "			</ram:BuyerTradeParty>\n" //$NON-NLS-1$
+//					+ "			<BuyerOrderReferencedDocument>\n"
+//					+ "				<IssueDateTime format=\"102\">20130301</IssueDateTime>\n"
+//					+ "			<ID>2013-471331</ID>\n"
+//					+ "			</BuyerOrderReferencedDocument>\n"
+					+ "		</ram:ApplicableSupplyChainTradeAgreement>\n" //$NON-NLS-1$
+					+ "		<ram:ApplicableSupplyChainTradeDelivery>\n"
+					+ "			<ram:ActualDeliverySupplyChainEvent>\n"
+					+ "				<ram:OccurrenceDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getDeliveryDate())+"</udt:DateTimeString></ram:OccurrenceDateTime>\n"
+					+ "			</ram:ActualDeliverySupplyChainEvent>\n"
+					/*
+					+ "			<DeliveryNoteReferencedDocument>\n"
+					+ "				<IssueDateTime format=\"102\">20130603</IssueDateTime>\n"
+					+ "				<ID>2013-51112</ID>\n"
+					+ "			</DeliveryNoteReferencedDocument>\n" */
+					+ "		</ram:ApplicableSupplyChainTradeDelivery>\n"
+					+ "		<ram:ApplicableSupplyChainTradeSettlement>\n" //$NON-NLS-1$
+					+ "			<ram:PaymentReference>"+trans.getNumber()+"</ram:PaymentReference>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "			<ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>\n" //$NON-NLS-1$
+					+ "			<ram:SpecifiedTradeSettlementPaymentMeans>\n" //$NON-NLS-1$
+					+ "				<ram:TypeCode>42</ram:TypeCode>\n" //$NON-NLS-1$
+					+ "				<ram:Information>Überweisung</ram:Information>\n" //$NON-NLS-1$
+					+ "				<ram:PayeePartyCreditorFinancialAccount>\n" //$NON-NLS-1$
+					+ "					<ram:IBANID>"+trans.getOwnIBAN()+"</ram:IBANID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:PayeePartyCreditorFinancialAccount>\n" //$NON-NLS-1$
+					+ "				<ram:PayeeSpecifiedCreditorFinancialInstitution>\n" //$NON-NLS-1$
+					+ "					<ram:BICID>"+trans.getOwnBIC()+"</ram:BICID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:Name>"+trans.getOwnBankName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				</ram:PayeeSpecifiedCreditorFinancialInstitution>\n" //$NON-NLS-1$
+					+ "			</ram:SpecifiedTradeSettlementPaymentMeans>\n"; //$NON-NLS-1$
 
 
-
-			}
-		}
-/*				xml+= "
-				+ "			<SpecifiedTradeAllowanceCharge>\n"
-				+ "				<ChargeIndicator>false</ChargeIndicator>\n"
-				+ "				<BasisAmount currencyID=\"EUR\">10</BasisAmount>\n"
-				+ "				<ActualAmount>1.00</ActualAmount>\n"
-				+ "				<Reason>Sondernachlass</Reason>\n"
-				+ "				<CategoryTradeTax>\n"
-				+ "					<TypeCode>VAT</TypeCode>\n"
-				+ "					<CategoryCode>S</CategoryCode>\n"
-				+ "					<ApplicablePercent>19</ApplicablePercent>\n"
-				+ "				</CategoryTradeTax>\n"
-				+ "			</SpecifiedTradeAllowanceCharge>\n"
-				+ "			<SpecifiedTradeAllowanceCharge>\n"
-				+ "				<ChargeIndicator>false</ChargeIndicator>\n"
-				+ "				<BasisAmount currencyID=\"EUR\">137.30</BasisAmount>\n"
-				+ "				<ActualAmount>13.73</ActualAmount>\n"
-				+ "				<Reason>Sondernachlass</Reason>\n"
-				+ "				<CategoryTradeTax>\n"
-				+ "					<TypeCode>VAT</TypeCode>\n"
-				+ "					<CategoryCode>S</CategoryCode>\n"
-				+ "					<ApplicablePercent>7</ApplicablePercent>\n"
-				+ "				</CategoryTradeTax>\n"
-				+ "							</SpecifiedTradeAllowanceCharge>\n"
-				+ "			<SpecifiedLogisticsServiceCharge>\n"
-				+ "				<Description>Versandkosten</Description>\n"
-				+ "				<AppliedAmount>5.80</AppliedAmount>\n"
-				+ "				<AppliedTradeTax>\n"
-				+ "					<TypeCode>VAT</TypeCode>\n"
-				+ "					<CategoryCode>S</CategoryCode>\n"
-				+ "					<ApplicablePercent>7</ApplicablePercent>\n"
-				+ "				</AppliedTradeTax>\n"
-				+ "			</SpecifiedLogisticsServiceCharge>\n"*/
-
-				xml=xml+ "			<ram:SpecifiedCITradePaymentTerms>\n" //$NON-NLS-1$
-				+ "				<ram:Description>Zahlbar ohne Abzug bis "+germanDateFormat.format(trans.getDueDate())+"</ram:Description>\n"
-				+ "				<ram:DueDateDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getDueDate())+"</udt:DateTimeString></ram:DueDateDateTime>\n"//20130704 //$NON-NLS-1$ //$NON-NLS-2$
-				+ "			</ram:SpecifiedCITradePaymentTerms>\n" //$NON-NLS-1$
-				+ "			<ram:SpecifiedCIIHTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
-				+ "				<ram:LineTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotal())+"</ram:LineTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				<ram:ChargeTotalAmount currencyID=\"EUR\">0.00</ram:ChargeTotalAmount>\n" //$NON-NLS-1$
-				+ "				<ram:AllowanceTotalAmount currencyID=\"EUR\">0.00</ram:AllowanceTotalAmount>\n" //$NON-NLS-1$
-//				+ "				<ChargeTotalAmount currencyID=\"EUR\">5.80</ChargeTotalAmount>\n"
-//				+ "				<AllowanceTotalAmount currencyID=\"EUR\">14.73</AllowanceTotalAmount>\n"
-				+ "				<ram:TaxBasisTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotal())+"</ram:TaxBasisTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				<ram:TaxTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross().subtract(getTotal()))+"</ram:TaxTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "				<ram:GrandTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross())+"</ram:GrandTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-//				+ "				<TotalPrepaidAmount currencyID=\"EUR\">0.00</TotalPrepaidAmount>\n"
-				+ "				<ram:DuePayableAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross())+"</ram:DuePayableAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-				+ "			</ram:SpecifiedCIIHTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
-				+ "		</ram:ApplicableCIIHSupplyChainTradeSettlement>\n"; //$NON-NLS-1$
-//				+ "		<IncludedSupplyChainTradeLineItem>\n"
-//				+ "			<AssociatedDocumentLineDocument>\n"
-//				+ "				<IncludedNote>\n"
-//				+ "					<Content>Wir erlauben uns Ihnen folgende Positionen aus der Lieferung Nr. 2013-51112 in Rechnung zu stellen:</Content>\n"
-//				+ "				</IncludedNote>\n"
-//				+ "			</AssociatedDocumentLineDocument>\n"
-//				+ "		</IncludedSupplyChainTradeLineItem>\n";
-
-
-				int lineID=0;
-				for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
-					lineID++;
-
-					LineCalc lc=new LineCalc(currentItem);
-					xml=xml+ "		<ram:IncludedCIILSupplyChainTradeLineItem>\n"+ //$NON-NLS-1$
-					"			<ram:AssociatedCIILDocumentLineDocument>\n" //$NON-NLS-1$
-							+ "				<ram:LineID>"+lineID+"</ram:LineID>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "			</ram:AssociatedCIILDocumentLineDocument>\n" //$NON-NLS-1$
-
-							+ "			<ram:SpecifiedCIILSupplyChainTradeAgreement>\n" //$NON-NLS-1$
-							+ "				<ram:GrossPriceProductCITradePrice>\n" //$NON-NLS-1$
-							+ "					<ram:ChargeAmount currencyID=\"EUR\">"+priceFormat(currentItem.getPrice())+"</ram:ChargeAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "					<ram:BasisQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">1.0000</ram:BasisQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$
-//							+ "					<AppliedTradeAllowanceCharge>\n"
-//							+ "						<ChargeIndicator>false</ChargeIndicator>\n"
-//							+ "						<ActualAmount currencyID=\"EUR\">0.6667</ActualAmount>\n"
-//							+ "						<Reason>Rabatt</Reason>\n"
-//							+ "					</AppliedTradeAllowanceCharge>\n"
-							+ "				</ram:GrossPriceProductCITradePrice>\n" //$NON-NLS-1$
-							+ "				<ram:NetPriceProductCITradePrice>\n" //$NON-NLS-1$
-							+ "					<ram:ChargeAmount currencyID=\"EUR\">"+priceFormat(currentItem.getPrice())+"</ram:ChargeAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "					<ram:BasisQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">1.0000</ram:BasisQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "				</ram:NetPriceProductCITradePrice>\n" //$NON-NLS-1$
-							+ "			</ram:SpecifiedCIILSupplyChainTradeAgreement>\n" //$NON-NLS-1$
-
-							+ "			<ram:SpecifiedCIILSupplyChainTradeDelivery>\n" //$NON-NLS-1$
-							+ "				<ram:BilledQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">"+quantityFormat(currentItem.getQuantity())+"</ram:BilledQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							+ "			</ram:SpecifiedCIILSupplyChainTradeDelivery>\n" //$NON-NLS-1$
-							+ "			<ram:SpecifiedCIILSupplyChainTradeSettlement>\n" //$NON-NLS-1$
-							+ "				<ram:ApplicableCITradeTax>\n" //$NON-NLS-1$
-							+ "					<ram:TypeCode>VAT</ram:TypeCode>\n" //$NON-NLS-1$
-							+ "					<ram:CategoryCode>S</ram:CategoryCode>\n" //$NON-NLS-1$
-							+ "					<ram:RateApplicablePercent>"+vatFormat(currentItem.getProduct().getVATPercent())+"</ram:RateApplicablePercent>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "				</ram:ApplicableCITradeTax>\n" //$NON-NLS-1$
-							+ "				<ram:SpecifiedCIILTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
-							+ "					<ram:LineTotalAmount currencyID=\"EUR\">"+currencyFormat(lc.getItemTotalNetAmount())+"</ram:LineTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "				</ram:SpecifiedCIILTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
-							+ "			</ram:SpecifiedCIILSupplyChainTradeSettlement>\n" //$NON-NLS-1$
-							+ "			<ram:SpecifiedCITradeProduct>\n" //$NON-NLS-1$
-//							+ "				<GlobalID schemeID=\"0160\">4012345001235</GlobalID>\n"
-//							+ "				<SellerAssignedID>KR3M</SellerAssignedID>\n"
-//							+ "				<BuyerAssignedID>55T01</BuyerAssignedID>\n"
-							+ "				<ram:Name>"+currentItem.getProduct().getName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "				<ram:Description>"+currentItem.getProduct().getDescription()+"</ram:Description>\n" //$NON-NLS-1$ //$NON-NLS-2$
-							+ "			</ram:SpecifiedCITradeProduct>\n" //$NON-NLS-1$
-							+ "		</ram:IncludedCIILSupplyChainTradeLineItem>\n"; //$NON-NLS-1$
+			
+			HashMap<BigDecimal, VATAmount> VATPercentAmountMap=getVATPercentAmountMap();
+			for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
+				VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
+				if (amount != null) {
+					xml += "			<ram:ApplicableTradeTax>\n" //$NON-NLS-1$
+									+ "				<ram:CalculatedAmount currencyID=\"EUR\">"+currencyFormat(amount.getCalculated())+"</ram:CalculatedAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+									+ "				<ram:TypeCode>VAT</ram:TypeCode>\n" //$NON-NLS-1$
+									+ "				<ram:BasisAmount currencyID=\"EUR\">"+currencyFormat(amount.getBasis())+"</ram:BasisAmount>\n"
+									+ "				<ram:CategoryCode>S</ram:CategoryCode>\n" //$NON-NLS-1$
+									+ "				<ram:ApplicablePercent>"+vatFormat(currentTaxPercent)+"</ram:ApplicablePercent>\n" //$NON-NLS-1$
+									+ "			</ram:ApplicableTradeTax>\n"; //$NON-NLS-1$
 
 
 
 				}
+			}
+	/*				xml+= "
+					+ "			<SpecifiedTradeAllowanceCharge>\n"
+					+ "				<ChargeIndicator>false</ChargeIndicator>\n"
+					+ "				<BasisAmount currencyID=\"EUR\">10</BasisAmount>\n"
+					+ "				<ActualAmount>1.00</ActualAmount>\n"
+					+ "				<Reason>Sondernachlass</Reason>\n"
+					+ "				<CategoryTradeTax>\n"
+					+ "					<TypeCode>VAT</TypeCode>\n"
+					+ "					<CategoryCode>S</CategoryCode>\n"
+					+ "					<ApplicablePercent>19</ApplicablePercent>\n"
+					+ "				</CategoryTradeTax>\n"
+					+ "			</SpecifiedTradeAllowanceCharge>\n"
+					+ "			<SpecifiedTradeAllowanceCharge>\n"
+					+ "				<ChargeIndicator>false</ChargeIndicator>\n"
+					+ "				<BasisAmount currencyID=\"EUR\">137.30</BasisAmount>\n"
+					+ "				<ActualAmount>13.73</ActualAmount>\n"
+					+ "				<Reason>Sondernachlass</Reason>\n"
+					+ "				<CategoryTradeTax>\n"
+					+ "					<TypeCode>VAT</TypeCode>\n"
+					+ "					<CategoryCode>S</CategoryCode>\n"
+					+ "					<ApplicablePercent>7</ApplicablePercent>\n"
+					+ "				</CategoryTradeTax>\n"
+					+ "							</SpecifiedTradeAllowanceCharge>\n"
+					+ "			<SpecifiedLogisticsServiceCharge>\n"
+					+ "				<Description>Versandkosten</Description>\n"
+					+ "				<AppliedAmount>5.80</AppliedAmount>\n"
+					+ "				<AppliedTradeTax>\n"
+					+ "					<TypeCode>VAT</TypeCode>\n"
+					+ "					<CategoryCode>S</CategoryCode>\n"
+					+ "					<ApplicablePercent>7</ApplicablePercent>\n"
+					+ "				</AppliedTradeTax>\n"
+					+ "			</SpecifiedLogisticsServiceCharge>\n"*/
+
+					xml=xml+ "			<ram:SpecifiedTradePaymentTerms>\n" //$NON-NLS-1$
+					+ "				<ram:Description>Zahlbar ohne Abzug bis "+germanDateFormat.format(trans.getDueDate())+"</ram:Description>\n"
+					+ "				<ram:DueDateDateTime><udt:DateTimeString format=\"102\">"+zugferdDateFormat.format(trans.getDueDate())+"</udt:DateTimeString></ram:DueDateDateTime>\n"//20130704 //$NON-NLS-1$ //$NON-NLS-2$
+					+ "			</ram:SpecifiedTradePaymentTerms>\n" //$NON-NLS-1$
+					+ "			<ram:SpecifiedTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
+					+ "				<ram:LineTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotal())+"</ram:LineTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				<ram:ChargeTotalAmount currencyID=\"EUR\">0.00</ram:ChargeTotalAmount>\n" //$NON-NLS-1$
+					+ "				<ram:AllowanceTotalAmount currencyID=\"EUR\">0.00</ram:AllowanceTotalAmount>\n" //$NON-NLS-1$
+//					+ "				<ChargeTotalAmount currencyID=\"EUR\">5.80</ChargeTotalAmount>\n"
+//					+ "				<AllowanceTotalAmount currencyID=\"EUR\">14.73</AllowanceTotalAmount>\n"
+					+ "				<ram:TaxBasisTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotal())+"</ram:TaxBasisTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				<ram:TaxTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross().subtract(getTotal()))+"</ram:TaxTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "				<ram:GrandTotalAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross())+"</ram:GrandTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+//					+ "				<TotalPrepaidAmount currencyID=\"EUR\">0.00</TotalPrepaidAmount>\n"
+					+ "				<ram:DuePayableAmount currencyID=\"EUR\">"+currencyFormat(getTotalGross())+"</ram:DuePayableAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "			</ram:SpecifiedTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
+					+ "		</ram:ApplicableSupplyChainTradeSettlement>\n"; //$NON-NLS-1$
+//					+ "		<IncludedSupplyChainTradeLineItem>\n"
+//					+ "			<AssociatedDocumentLineDocument>\n"
+//					+ "				<IncludedNote>\n"
+//					+ "					<Content>Wir erlauben uns Ihnen folgende Positionen aus der Lieferung Nr. 2013-51112 in Rechnung zu stellen:</Content>\n"
+//					+ "				</IncludedNote>\n"
+//					+ "			</AssociatedDocumentLineDocument>\n"
+//					+ "		</IncludedSupplyChainTradeLineItem>\n";
 
 
-				xml=xml	+ "	</rsm:CIIHSupplyChainTradeTransaction>\n" //$NON-NLS-1$
-				+ "</rsm:CrossIndustryInvoice>"; //$NON-NLS-1$
+					int lineID=0;
+					for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
+						lineID++;
+
+						LineCalc lc=new LineCalc(currentItem);
+						xml=xml+ "		<ram:IncludedSupplyChainTradeLineItem>\n"+ //$NON-NLS-1$
+						"			<ram:AssociatedDocumentLineDocument>\n" //$NON-NLS-1$
+								+ "				<ram:LineID>"+lineID+"</ram:LineID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "			</ram:AssociatedDocumentLineDocument>\n" //$NON-NLS-1$
+
+								+ "			<ram:SpecifiedSupplyChainTradeAgreement>\n" //$NON-NLS-1$
+								+ "				<ram:GrossPriceProductTradePrice>\n" //$NON-NLS-1$
+								+ "					<ram:ChargeAmount currencyID=\"EUR\">"+priceFormat(currentItem.getPrice())+"</ram:ChargeAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "					<ram:BasisQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">1.0000</ram:BasisQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$
+//								+ "					<AppliedTradeAllowanceCharge>\n"
+//								+ "						<ChargeIndicator>false</ChargeIndicator>\n"
+//								+ "						<ActualAmount currencyID=\"EUR\">0.6667</ActualAmount>\n"
+//								+ "						<Reason>Rabatt</Reason>\n"
+//								+ "					</AppliedTradeAllowanceCharge>\n"
+								+ "				</ram:GrossPriceProductTradePrice>\n" //$NON-NLS-1$
+								+ "				<ram:NetPriceProductTradePrice>\n" //$NON-NLS-1$
+								+ "					<ram:ChargeAmount currencyID=\"EUR\">"+priceFormat(currentItem.getPrice())+"</ram:ChargeAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "					<ram:BasisQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">1.0000</ram:BasisQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "				</ram:NetPriceProductTradePrice>\n" //$NON-NLS-1$
+								+ "			</ram:SpecifiedSupplyChainTradeAgreement>\n" //$NON-NLS-1$
+
+								+ "			<ram:SpecifiedSupplyChainTradeDelivery>\n" //$NON-NLS-1$
+								+ "				<ram:BilledQuantity unitCode=\""+currentItem.getProduct().getUnit()+"\">"+quantityFormat(currentItem.getQuantity())+"</ram:BilledQuantity>\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+								+ "			</ram:SpecifiedSupplyChainTradeDelivery>\n" //$NON-NLS-1$
+								+ "			<ram:SpecifiedSupplyChainTradeSettlement>\n" //$NON-NLS-1$
+								+ "				<ram:ApplicableTradeTax>\n" //$NON-NLS-1$
+								+ "					<ram:TypeCode>VAT</ram:TypeCode>\n" //$NON-NLS-1$
+								+ "					<ram:CategoryCode>S</ram:CategoryCode>\n" //$NON-NLS-1$
+								+ "					<ram:ApplicablePercent>"+vatFormat(currentItem.getProduct().getVATPercent())+"</ram:ApplicablePercent>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "				</ram:ApplicableTradeTax>\n" //$NON-NLS-1$
+								+ "				<ram:SpecifiedTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
+								+ "					<ram:LineTotalAmount currencyID=\"EUR\">"+currencyFormat(lc.getItemTotalNetAmount())+"</ram:LineTotalAmount>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "				</ram:SpecifiedTradeSettlementMonetarySummation>\n" //$NON-NLS-1$
+								+ "			</ram:SpecifiedSupplyChainTradeSettlement>\n" //$NON-NLS-1$
+								+ "			<ram:SpecifiedTradeProduct>\n" //$NON-NLS-1$
+//								+ "				<GlobalID schemeID=\"0160\">4012345001235</GlobalID>\n"
+//								+ "				<SellerAssignedID>KR3M</SellerAssignedID>\n"
+//								+ "				<BuyerAssignedID>55T01</BuyerAssignedID>\n"
+								+ "				<ram:Name>"+currentItem.getProduct().getName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "				<ram:Description>"+currentItem.getProduct().getDescription()+"</ram:Description>\n" //$NON-NLS-1$ //$NON-NLS-2$
+								+ "			</ram:SpecifiedTradeProduct>\n" //$NON-NLS-1$
+								+ "		</ram:IncludedSupplyChainTradeLineItem>\n"; //$NON-NLS-1$
+
+
+
+					}
+
+
+					xml=xml	+ "	</rsm:SpecifiedSupplyChainTradeTransaction>\n" //$NON-NLS-1$
+					+ "</rsm:CrossIndustryDocument>"; //$NON-NLS-1$
+					
 				byte[] zugferdRaw;
 				try {
 					zugferdRaw = xml.getBytes("UTF-8");
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java
index b2a3c71a..8d07879f 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java
@@ -4,21 +4,9 @@ public class ZUGFeRDMigrator {
 
 	public String migrateFromV1ToV2(String xml) {
 /***
- 
-
-<rsm:CrossIndustryDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rsm="urn:ferd:CrossIndustryDocument:invoice:1p0" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15">
-->
-<rsm:CrossIndustryInvoice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
-
-
-
-
-ram:SpecifiedTradeSettlementMonetarySummation->ram:SpecifiedTradeSettlementHeaderMonetarySummation
-ram:IncludedSupplyChainTradeLineItem->
-->
-->
-->
-ram:SpecifiedTradeProduct->
+ * http://www.unece.org/fileadmin/DAM/cefact/xml/XML-Naming-And-Design-Rules-V2_1.pdf
+ * http://www.ferd-net.de/upload/Dokumente/FACTUR-X_ZUGFeRD_2p0_Teil1_Profil_EN16931_1p03.pdf
+http://countwordsfree.com/xmlviewer
  */
 		// todo: attributes may also be in single quotes, this one hardcodedly expects
 		// double ones
@@ -40,13 +28,16 @@ ram:SpecifiedTradeProduct->
 		xml = xml.replace("ram:SpecifiedSupplyChainTradeDelivery", "ram:SpecifiedLineTradeDelivery");
 		xml = xml.replace("ram:SpecifiedSupplyChainTradeSettlement", "ram:SpecifiedLineTradeSettlement");
 		xml = xml.replace("ram:SpecifiedTradeSettlementMonetarySummation", "ram:SpecifiedTradeSettlementLineMonetarySummation");
-		xml = xml.replace("ram:SpecifiedTradeSettlementLineMonetarySummation", "ram:SpecifiedTradeSettlementHeaderMonetarySummation");
-		xml = xml.replace("ram:IssueDateTime","ram:FormattedIssueDateTime");
+		//xml = xml.replace("ram:SpecifiedTradeSettlementLineMonetarySummation", "ram:SpecifiedTradeSettlementHeaderMonetarySummation");
+		//ram:SpecifiedTradeSettlementLineMonetarySummation bleibt unterhalb von ram:SpecifiedLineTradeSettlement
+		//xml = xml.replace("ram:IssueDateTime","ram:FormattedIssueDateTime");
 		xml = xml.replace("ram:SpecifiedTradeAccountingAccount","ram:SalesSpecifiedTradeAccountingAccount");
 		xml = xml.replace("ram:SpecifiedSupplyChainTradeAgreement","ram:SpecifiedLineTradeAgreement");
-		xml = xml.replace("ram:ID","ram:GlobalID");
+		//xml = xml.replace("ram:ID","ram:GlobalID");
 		
+		//ram:ID unterhalb von ram:ContractReferencedDocument zu ram:IssuerAssignedID
 		
+		//http://www.unece.org/fileadmin/DAM/cefact/xml/XML-Naming-And-Design-Rules-V2_1.pdf
 		/*
 		xml = xml.replace("rsm:SpecifiedExchangedDocumentContext", "rsm:CIExchangedDocumentContext");
 		xml = xml.replace("rsm:HeaderExchangedDocument", "rsm:CIIHExchangedDocument");