diff --git a/ChangeLog b/ChangeLog
index cc3083a98d8d958c36974fa0a32c5d9dc293e598..05e33b62c364a8e0bc4d8221c139f06aaa5a5535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-02-21 Richard Larsson <larsson@mps.mpg.de>
+
+	* ARTS-XML-DATA-2-3-30
+	
+	* spectroscopy/nlte/H2O/*:  Fix to error in QID
+	for water collisions.  Renamed files to fit with
+	new reading routine required to add other collisional
+	partners (e.g., water-electron collisions)
+
 2019-01-23 Richard Larsson <larsson@mps.mpg.de>
 
 	* ARTS-XML-DATA-2-3-29
diff --git a/spectroscopy/nlte/H2O/H2O.xml b/spectroscopy/nlte/H2O/H2O.xml
new file mode 100644
index 0000000000000000000000000000000000000000..97391d3baa6f24728191de611938414ed24a2e3a
--- /dev/null
+++ b/spectroscopy/nlte/H2O/H2O.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<arts version="1" format="ascii">
+<Array nelem="9" type="GriddedField1">
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.413e-15 9.0662e-16  8.0830e-16  7.3238e-16  6.7407e-16  6.3072e-16  5.9562e-16  5.6843e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.569e-15 1.1088e-15  9.5641e-16  8.7828e-16  8.2423e-16  7.8219e-16  7.4773e-16  7.1600e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.044e-15 1.0316e-15  1.0493e-15  1.0512e-15  1.0414e-15  1.0271e-15  1.0097e-15  9.9065e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.124e-15 8.1028e-16  6.9618e-16  6.3286e-16  5.8657e-16  5.4907e-16  5.1766e-16  4.9191e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.269e-15 9.4761e-16  8.2755e-16  7.6330e-16  7.1836e-16  6.8161e-16  6.5058e-16  6.2445e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+3.304e-16 2.9924e-16  2.5270e-16  2.1933e-16  2.0000e-16  2.0000e-16  2.0000e-16  2.0000e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.065e-15 9.7835e-16  8.5349e-16  7.6040e-16  6.9244e-16  6.4019e-16  6.0074e-16  5.6979e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+3.174e-16 4.1129e-16  4.9368e-16  5.4977e-16  5.8441e-16  6.0469e-16  6.1607e-16  6.2035e-16
+</Vector>
+</GriddedField1>
+<GriddedField1>
+<Vector name="Temperature" nelem="8">
+100 200 300 400 500 600 700 800
+</Vector>
+<Vector name="Collision rate" nelem="8">
+1.122e-15 1.1027e-15  9.8068e-16  8.7828e-16  8.0046e-16  7.4078e-16  6.9276e-16  6.5451e-16
+</Vector>
+</GriddedField1>
+</Array>
+</arts>
diff --git a/spectroscopy/nlte/H2O/README b/spectroscopy/nlte/H2O/README
index cdcc1b108d0e2cbab5cadc348f0b786558523199..a91efb9cc48c8241a38f412867378fe911fac6b5 100644
--- a/spectroscopy/nlte/H2O/README
+++ b/spectroscopy/nlte/H2O/README
@@ -2,4 +2,9 @@ Collisional parameters used by rotational water non-lte calculations.
 
 Unit of the data is in per second per cubic meter.
 
-Data is from H2O-H2O Collision Rate Coefficients by G. Buffa et al. The Astrophysical Journal Supplement Series, 128: 597-601, 2000 June
\ No newline at end of file
+The standard ARTS-way to read this data should be similar to how
+lines and atmosphere are read, with all species of abs_species
+existing in the same folder (as of 2019-02-21, the only supported
+species is H2O)
+
+Data is from H2O-H2O Collision Rate Coefficients by G. Buffa et al. The Astrophysical Journal Supplement Series, 128: 597-601, 2000 June
diff --git a/spectroscopy/nlte/H2O/nlte_collision_coefficients.xml b/spectroscopy/nlte/H2O/nlte_collision_coefficients.xml
deleted file mode 100644
index 33657f18e934d5d9de8e945f2b3f5c5bf7294c29..0000000000000000000000000000000000000000
--- a/spectroscopy/nlte/H2O/nlte_collision_coefficients.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-<arts version="1" format="ascii">
-<Array nelem="9" type="GriddedField1">
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.4130000e-15
-9.0662000e-16
-8.0830000e-16
-7.3238000e-16
-6.7407000e-16
-6.3072000e-16
-5.9562000e-16
-5.6843000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.5690000e-15
-1.1088000e-15
-9.5641000e-16
-8.7828000e-16
-8.2423000e-16
-7.8219000e-16
-7.4773000e-16
-7.1600000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.0440000e-15
-1.0316000e-15
-1.0493000e-15
-1.0512000e-15
-1.0414000e-15
-1.0271000e-15
-1.0097000e-15
-9.9065000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.1240000e-15
-8.1028000e-16
-6.9618000e-16
-6.3286000e-16
-5.8657000e-16
-5.4907000e-16
-5.1766000e-16
-4.9191000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.2690000e-15
-9.4761000e-16
-8.2755000e-16
-7.6330000e-16
-7.1836000e-16
-6.8161000e-16
-6.5058000e-16
-6.2445000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-3.3040000e-16
-2.9924000e-16
-2.5270000e-16
-2.1933000e-16
-2.0000000e-16
-2.0000000e-16
-2.0000000e-16
-2.0000000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.0650000e-15
-9.7835000e-16
-8.5349000e-16
-7.6040000e-16
-6.9244000e-16
-6.4019000e-16
-6.0074000e-16
-5.6979000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-3.1740000e-16
-4.1129000e-16
-4.9368000e-16
-5.4977000e-16
-5.8441000e-16
-6.0469000e-16
-6.1607000e-16
-6.2035000e-16
-</Vector>
-</GriddedField1>
-<GriddedField1>
-<Vector name="Temperature" nelem="8">
-1.0000000e+02
-2.0000000e+02
-3.0000000e+02
-4.0000000e+02
-5.0000000e+02
-6.0000000e+02
-7.0000000e+02
-8.0000000e+02
-</Vector>
-<Vector name="Collision rate" nelem="8">
-1.1220000e-15
-1.1027000e-15
-9.8068000e-16
-8.7828000e-16
-8.0046000e-16
-7.4078000e-16
-6.9276000e-16
-6.5451000e-16
-</Vector>
-</GriddedField1>
-</Array>
-</arts>
diff --git a/spectroscopy/nlte/H2O/nlte_collision_identities.xml b/spectroscopy/nlte/H2O/qid.xml
similarity index 92%
rename from spectroscopy/nlte/H2O/nlte_collision_identities.xml
rename to spectroscopy/nlte/H2O/qid.xml
index a939b2c1ff9dd0d756d11de9499f71428ab02f69..79f6b327dca1240069dc500e5fe73bd64cc6481c 100644
--- a/spectroscopy/nlte/H2O/nlte_collision_identities.xml
+++ b/spectroscopy/nlte/H2O/qid.xml
@@ -2,7 +2,7 @@
 <arts version="1" format="ascii">
 <Array nelem="9" type="QuantumIdentifier">
 <QuantumIdentifier>H2O-161 TR UP J 1 Ka 1 Kc 0 LO J 1 Ka 0 Kc 1</QuantumIdentifier>
-<QuantumIdentifier>H2O-161 TR UP J 2 Ka 1 Kc 2 LO J 1 Ka 0 Kc 0</QuantumIdentifier>
+<QuantumIdentifier>H2O-161 TR UP J 2 Ka 1 Kc 2 LO J 1 Ka 0 Kc 1</QuantumIdentifier>
 <QuantumIdentifier>H2O-161 TR UP J 2 Ka 2 Kc 1 LO J 1 Ka 1 Kc 0</QuantumIdentifier>
 <QuantumIdentifier>H2O-161 TR UP J 2 Ka 2 Kc 1 LO J 2 Ka 1 Kc 2</QuantumIdentifier>
 <QuantumIdentifier>H2O-161 TR UP J 3 Ka 0 Kc 3 LO J 2 Ka 1 Kc 2</QuantumIdentifier>