diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
index 66b966711..3b27061fb 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
@@ -3,13 +3,9 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-09 11:25:24  pnenzi
 
-  Changed adms required version to 2.1.3 ,J
-
-  Revision 1.1  2006/01/31 17:53:48  pnenzi
-
-  Initial import for admst (Verilog-AMS) translators for ngspice.
+  Latest update from Laurent and Dietmar: (empty instances)
 
 -->
 
@@ -272,22 +268,18 @@ typedef struct s$(module)model {         /* model structure */
 
   <admst:text format="  /* flags */\n"/>
   <admst:text format="typedef enum {\n"/>
-  <admst:if test="variable[nilled([parametertype='model' and input='yes'])]">
-    <admst:text format="  DUMMY /* no model parameter found */"/>
-  </admst:if>
-  <admst:join select="variable[parametertype='model' and input='yes']"  separator=",\n">
+  <admst:for-each select="variable[parametertype='model' and input='yes']">
     <admst:value-of select="name"/>
-    <admst:text format="  $(module)_model_%s"/>
-  </admst:join>
+    <admst:text format="  $(module)_model_%s,\n"/>
+  </admst:for-each>
+    <admst:text format="  DUMMY_MODEL"/>
   <admst:text format="\n} e_$(module)_model;\n"/>
   <admst:text format="typedef enum {\n"/>
-  <admst:if test="variable[nilled([parametertype='instance' and input='yes'])]">
-    <admst:text format="  DUMMY /* no instance parameter found */"/>
-  </admst:if>
-  <admst:join select="variable[parametertype='instance' and input='yes']" separator=",\n">
+  <admst:for-each select="variable[parametertype='instance' and input='yes']">
     <admst:value-of select="name"/>
-    <admst:text format="  $(module)_instance_%s"/>
-  </admst:join>
+    <admst:text format="  $(module)_instance_%s,\n"/>
+  </admst:for-each>
+  <admst:text format="  DUMMY_INSTANCE"/>
   <admst:text format="\n} e_$(module)_instance;\n"/>
 
 #include &quot;$(module)ext.h&quot;
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index c208c7186..9ff965b94 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -5,9 +5,9 @@
 -->
 <!--
   $Log$
-  Revision 1.5  2006-02-08 09:36:48  pnenzi
+  Revision 1.6  2006-02-09 11:25:24  pnenzi
 
-  Fixed a typo (Dietmar)
+  Latest update from Laurent and Dietmar: (empty instances)
 
   Revision 1.3  2006/02/02 17:56:31  pnenzi
 
@@ -1708,110 +1708,120 @@
   <admst:for-each select="/module">
     <admst:choose>
       <admst:when test="[name='juncap2']">
-        <admst:value-of select="analog"/>
-        <admst:value-of select="."/>
-        <admst:new datatype="variable" arguments="%p,d,%p">
-          <admst:push into="module/variable" select="." onduplicate="ignore"/>
-          <admst:value-to select="sizetype" value="scalar"/>
-          <admst:value-to select="type" value="integer"/>
-          <admst:value-to select="input" value="yes"/>
-          <admst:value-to select="output" value="yes"/>
-          <admst:value-to select="parametertype" value="model"/>
-          <admst:value-to select="scope" value="global_model"/>
-          <admst:new datatype="number" arguments="1">
-            <admst:value-to select="scalingunit" value="1"/>
-            <admst:value-of select="."/>
-            <admst:value-of select="../module"/>
-            <admst:new datatype="expression" arguments="%p,%p">
+        <admst:if test="[nilled(variable[name='d'])]">
+          <admst:value-of select="analog"/>
+          <admst:value-of select="."/>
+          <admst:new datatype="variable" arguments="%p,d,%p">
+            <admst:push into="module/variable" select="." onduplicate="ignore"/>
+            <admst:value-to select="sizetype" value="scalar"/>
+            <admst:value-to select="type" value="integer"/>
+            <admst:value-to select="input" value="yes"/>
+            <admst:value-to select="output" value="yes"/>
+            <admst:value-to select="parametertype" value="model"/>
+            <admst:value-to select="scope" value="global_model"/>
+            <admst:new datatype="number" arguments="1">
+              <admst:value-to select="scalingunit" value="1"/>
               <admst:value-of select="."/>
-              <admst:value-to select="../../default" value="%p"/>
+              <admst:value-of select="../module"/>
+              <admst:new datatype="expression" arguments="%p,%p">
+                <admst:value-of select="."/>
+                <admst:value-to select="../../default" value="%p"/>
+              </admst:new>
             </admst:new>
           </admst:new>
-        </admst:new>
+        </admst:if>
       </admst:when>
-      <admst:when test="[name='vbic' or name='hic0_full' or name='hic21_full' or name='bjt504_va']">
-        <admst:value-of select="analog"/>
-        <admst:value-of select="."/>
-        <admst:new datatype="variable" arguments="%p,npn,%p">
-          <admst:push into="module/variable" select="." onduplicate="ignore"/>
-          <admst:value-to select="sizetype" value="scalar"/>
-          <admst:value-to select="type" value="integer"/>
-          <admst:value-to select="input" value="yes"/>
-          <admst:value-to select="output" value="yes"/>
-          <admst:value-to select="parametertype" value="model"/>
-          <admst:value-to select="scope" value="global_model"/>
-          <admst:new datatype="number" arguments="1">
-            <admst:value-to select="scalingunit" value="1"/>
-            <admst:value-of select="."/>
-            <admst:value-of select="../module"/>
-            <admst:new datatype="expression" arguments="%p,%p">
+      <admst:when test="[name='vbic' or name='hic0_full' or name='hic2_full' or name='bjt504_va']">
+        <admst:if test="[nilled(variable[name='npn'])]">
+          <admst:value-of select="analog"/>
+          <admst:value-of select="."/>
+          <admst:new datatype="variable" arguments="%p,npn,%p">
+            <admst:push into="module/variable" select="." onduplicate="ignore"/>
+            <admst:value-to select="sizetype" value="scalar"/>
+            <admst:value-to select="type" value="integer"/>
+            <admst:value-to select="input" value="yes"/>
+            <admst:value-to select="output" value="yes"/>
+            <admst:value-to select="parametertype" value="model"/>
+            <admst:value-to select="scope" value="global_model"/>
+            <admst:new datatype="number" arguments="1">
+              <admst:value-to select="scalingunit" value="1"/>
               <admst:value-of select="."/>
-              <admst:value-to select="../../default" value="%p"/>
+              <admst:value-of select="../module"/>
+              <admst:new datatype="expression" arguments="%p,%p">
+                <admst:value-of select="."/>
+                <admst:value-to select="../../default" value="%p"/>
+              </admst:new>
             </admst:new>
           </admst:new>
-        </admst:new>
-        <admst:value-of select="analog"/>
-        <admst:value-of select="."/>
-        <admst:new datatype="variable" arguments="%p,pnp,%p">
-          <admst:push into="module/variable" select="." onduplicate="ignore"/>
-          <admst:value-to select="sizetype" value="scalar"/>
-          <admst:value-to select="type" value="integer"/>
-          <admst:value-to select="input" value="yes"/>
-          <admst:value-to select="output" value="yes"/>
-          <admst:value-to select="parametertype" value="model"/>
-          <admst:value-to select="scope" value="global_model"/>
-          <admst:new datatype="number" arguments="1">
-            <admst:value-to select="scalingunit" value="1"/>
-            <admst:value-of select="."/>
-            <admst:value-of select="../module"/>
-            <admst:new datatype="expression" arguments="%p,%p">
+        </admst:if>
+        <admst:if test="[nilled(variable[name='pnp'])]">
+          <admst:value-of select="analog"/>
+          <admst:value-of select="."/>
+          <admst:new datatype="variable" arguments="%p,pnp,%p">
+            <admst:push into="module/variable" select="." onduplicate="ignore"/>
+            <admst:value-to select="sizetype" value="scalar"/>
+            <admst:value-to select="type" value="integer"/>
+            <admst:value-to select="input" value="yes"/>
+            <admst:value-to select="output" value="yes"/>
+            <admst:value-to select="parametertype" value="model"/>
+            <admst:value-to select="scope" value="global_model"/>
+            <admst:new datatype="number" arguments="1">
+              <admst:value-to select="scalingunit" value="1"/>
               <admst:value-of select="."/>
-              <admst:value-to select="../../default" value="%p"/>
+              <admst:value-of select="../module"/>
+              <admst:new datatype="expression" arguments="%p,%p">
+                <admst:value-of select="."/>
+                <admst:value-to select="../../default" value="%p"/>
+              </admst:new>
             </admst:new>
           </admst:new>
-        </admst:new>
+        </admst:if>
       </admst:when>
       <admst:when test="[name='pspva']">
-        <admst:value-of select="analog"/>
-        <admst:value-of select="."/>
-        <admst:new datatype="variable" arguments="%p,nmos,%p">
-          <admst:push into="module/variable" select="." onduplicate="ignore"/>
-          <admst:value-to select="sizetype" value="scalar"/>
-          <admst:value-to select="type" value="integer"/>
-          <admst:value-to select="input" value="yes"/>
-          <admst:value-to select="output" value="yes"/>
-          <admst:value-to select="parametertype" value="model"/>
-          <admst:value-to select="scope" value="global_model"/>
-          <admst:new datatype="number" arguments="1">
-            <admst:value-to select="scalingunit" value="1"/>
-            <admst:value-of select="."/>
-            <admst:value-of select="../module"/>
-            <admst:new datatype="expression" arguments="%p,%p">
+        <admst:if test="[nilled(variable[name='nmos'])]">
+          <admst:value-of select="analog"/>
+          <admst:value-of select="."/>
+          <admst:new datatype="variable" arguments="%p,nmos,%p">
+            <admst:push into="module/variable" select="." onduplicate="ignore"/>
+            <admst:value-to select="sizetype" value="scalar"/>
+            <admst:value-to select="type" value="integer"/>
+            <admst:value-to select="input" value="yes"/>
+            <admst:value-to select="output" value="yes"/>
+            <admst:value-to select="parametertype" value="model"/>
+            <admst:value-to select="scope" value="global_model"/>
+            <admst:new datatype="number" arguments="1">
+              <admst:value-to select="scalingunit" value="1"/>
               <admst:value-of select="."/>
-              <admst:value-to select="../../default" value="%p"/>
+              <admst:value-of select="../module"/>
+              <admst:new datatype="expression" arguments="%p,%p">
+                <admst:value-of select="."/>
+                <admst:value-to select="../../default" value="%p"/>
+              </admst:new>
             </admst:new>
           </admst:new>
-        </admst:new>
-        <admst:value-of select="analog"/>
-        <admst:value-of select="."/>
-        <admst:new datatype="variable" arguments="%p,pmos,%p">
-          <admst:push into="module/variable" select="." onduplicate="ignore"/>
-          <admst:value-to select="sizetype" value="scalar"/>
-          <admst:value-to select="type" value="integer"/>
-          <admst:value-to select="input" value="yes"/>
-          <admst:value-to select="output" value="yes"/>
-          <admst:value-to select="parametertype" value="model"/>
-          <admst:value-to select="scope" value="global_model"/>
-          <admst:new datatype="number" arguments="1">
-            <admst:value-to select="scalingunit" value="1"/>
-            <admst:value-of select="."/>
-            <admst:value-of select="../module"/>
-            <admst:new datatype="expression" arguments="%p,%p">
+        </admst:if>
+        <admst:if test="[nilled(variable[name='pmos'])]">
+          <admst:value-of select="analog"/>
+          <admst:value-of select="."/>
+          <admst:new datatype="variable" arguments="%p,pmos,%p">
+            <admst:push into="module/variable" select="." onduplicate="ignore"/>
+            <admst:value-to select="sizetype" value="scalar"/>
+            <admst:value-to select="type" value="integer"/>
+            <admst:value-to select="input" value="yes"/>
+            <admst:value-to select="output" value="yes"/>
+            <admst:value-to select="parametertype" value="model"/>
+            <admst:value-to select="scope" value="global_model"/>
+            <admst:new datatype="number" arguments="1">
+              <admst:value-to select="scalingunit" value="1"/>
               <admst:value-of select="."/>
-              <admst:value-to select="../../default" value="%p"/>
+              <admst:value-of select="../module"/>
+              <admst:new datatype="expression" arguments="%p,%p">
+                <admst:value-of select="."/>
+                <admst:value-to select="../../default" value="%p"/>
+              </admst:new>
             </admst:new>
           </admst:new>
-        </admst:new>
+        </admst:if>
       </admst:when>
       <admst:otherwise>
         <admst:value-of select="name"/>