diff --git a/visualc/src/include/ngspice/config.h b/visualc/src/include/ngspice/config.h
index 65129bf8d..ae78ebe6e 100644
--- a/visualc/src/include/ngspice/config.h
+++ b/visualc/src/include/ngspice/config.h
@@ -12,7 +12,7 @@
 /* #undef CAPBYPASS */
 
 /* The CIDER enhancements */
-#define CIDER 1
+/* #undef CIDER */
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 /* #undef CLOSEDIR_VOID */
@@ -496,6 +496,9 @@
 /* Define if you want to debug pole-zero analysis */
 /* #undef PZDEBUG */
 
+/* Enable the reliability code. */
+#define RELAN 1
+
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index 98da57826..2b5038d7c 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -297,7 +297,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;src\include;..\src\include;..\src\spicelib\parser;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;USE_OMP;NGDEBUG;CONFIG64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -767,10 +767,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\ciderlib\oned\oneddefs.h" />
-    <ClInclude Include="..\src\ciderlib\oned\onedext.h" />
-    <ClInclude Include="..\src\ciderlib\twod\twoddefs.h" />
-    <ClInclude Include="..\src\ciderlib\twod\twodext.h" />
     <ClInclude Include="..\src\conf.h" />
     <ClInclude Include="..\src\frontend\arg.h" />
     <ClInclude Include="..\src\frontend\aspice.h" />
@@ -970,8 +966,6 @@
     <ClInclude Include="..\src\include\ngspice\numenum.h" />
     <ClInclude Include="..\src\include\ngspice\numgen.h" />
     <ClInclude Include="..\src\include\ngspice\numglobs.h" />
-    <ClInclude Include="..\src\include\ngspice\onedev.h" />
-    <ClInclude Include="..\src\include\ngspice\onemesh.h" />
     <ClInclude Include="..\src\include\ngspice\opdefs.h" />
     <ClInclude Include="..\src\include\ngspice\optdefs.h" />
     <ClInclude Include="..\src\include\ngspice\optndefs.h" />
@@ -996,8 +990,6 @@
     <ClInclude Include="..\src\include\ngspice\trandefs.h" />
     <ClInclude Include="..\src\include\ngspice\trcvdefs.h" />
     <ClInclude Include="..\src\include\ngspice\tskdefs.h" />
-    <ClInclude Include="..\src\include\ngspice\twodev.h" />
-    <ClInclude Include="..\src\include\ngspice\twomesh.h" />
     <ClInclude Include="..\src\include\ngspice\typedefs.h" />
     <ClInclude Include="..\src\include\ngspice\wallace.h" />
     <ClInclude Include="..\src\include\ngspice\wordlist.h" />
@@ -1206,26 +1198,10 @@
     <ClInclude Include="..\src\spicelib\devices\mos9\mos9ext.h" />
     <ClInclude Include="..\src\spicelib\devices\mos9\mos9init.h" />
     <ClInclude Include="..\src\spicelib\devices\mos9\mos9itf.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt2\nbjt2def.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt2\nbjt2ext.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt2\nbjt2itf.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt2\nbt2init.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt\nbjtdefs.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt\nbjtext.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt\nbjtinit.h" />
-    <ClInclude Include="..\src\spicelib\devices\nbjt\nbjtitf.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd2\numd2def.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd2\numd2ext.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd2\numd2init.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd2\numd2itf.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd\numddefs.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd\numdext.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd\numdinit.h" />
-    <ClInclude Include="..\src\spicelib\devices\numd\numditf.h" />
-    <ClInclude Include="..\src\spicelib\devices\numos\numosdef.h" />
-    <ClInclude Include="..\src\spicelib\devices\numos\numosext.h" />
-    <ClInclude Include="..\src\spicelib\devices\numos\numosinit.h" />
-    <ClInclude Include="..\src\spicelib\devices\numos\numositf.h" />
+    <ClInclude Include="..\src\spicelib\devices\relmodel\relmodeldefs.h" />
+    <ClInclude Include="..\src\spicelib\devices\relmodel\relmodelext.h" />
+    <ClInclude Include="..\src\spicelib\devices\relmodel\relmodelinit.h" />
+    <ClInclude Include="..\src\spicelib\devices\relmodel\relmodelitf.h" />
     <ClInclude Include="..\src\spicelib\devices\res\resdefs.h" />
     <ClInclude Include="..\src\spicelib\devices\res\resext.h" />
     <ClInclude Include="..\src\spicelib\devices\res\resinit.h" />
@@ -1286,78 +1262,6 @@
     <None Include="..\src\xspice\icm\objects.inc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\ciderlib\input\bdryset.c" />
-    <ClCompile Include="..\src\ciderlib\input\boundary.c" />
-    <ClCompile Include="..\src\ciderlib\input\cards.c" />
-    <ClCompile Include="..\src\ciderlib\input\contact.c" />
-    <ClCompile Include="..\src\ciderlib\input\contset.c" />
-    <ClCompile Include="..\src\ciderlib\input\domain.c" />
-    <ClCompile Include="..\src\ciderlib\input\domnset.c" />
-    <ClCompile Include="..\src\ciderlib\input\doping.c" />
-    <ClCompile Include="..\src\ciderlib\input\dopset.c" />
-    <ClCompile Include="..\src\ciderlib\input\elctset.c" />
-    <ClCompile Include="..\src\ciderlib\input\electrod.c" />
-    <ClCompile Include="..\src\ciderlib\input\material.c" />
-    <ClCompile Include="..\src\ciderlib\input\matlset.c" />
-    <ClCompile Include="..\src\ciderlib\input\mesh.c" />
-    <ClCompile Include="..\src\ciderlib\input\meshset.c" />
-    <ClCompile Include="..\src\ciderlib\input\method.c" />
-    <ClCompile Include="..\src\ciderlib\input\mobility.c" />
-    <ClCompile Include="..\src\ciderlib\input\mobset.c" />
-    <ClCompile Include="..\src\ciderlib\input\models.c" />
-    <ClCompile Include="..\src\ciderlib\input\modlset.c" />
-    <ClCompile Include="..\src\ciderlib\input\optionsc.c" />
-    <ClCompile Include="..\src\ciderlib\input\outpset.c" />
-    <ClCompile Include="..\src\ciderlib\input\output.c" />
-    <ClCompile Include="..\src\ciderlib\oned\oneadmit.c" />
-    <ClCompile Include="..\src\ciderlib\oned\oneaval.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onecond.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onecont.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onedest.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onedopng.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onefreez.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onemesh.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onepoiss.c" />
-    <ClCompile Include="..\src\ciderlib\oned\oneprint.c" />
-    <ClCompile Include="..\src\ciderlib\oned\oneproj.c" />
-    <ClCompile Include="..\src\ciderlib\oned\oneread.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onesetup.c" />
-    <ClCompile Include="..\src\ciderlib\oned\onesolve.c" />
-    <ClCompile Include="..\src\ciderlib\support\database.c" />
-    <ClCompile Include="..\src\ciderlib\support\devprint.c" />
-    <ClCompile Include="..\src\ciderlib\support\geominfo.c" />
-    <ClCompile Include="..\src\ciderlib\support\globals.c" />
-    <ClCompile Include="..\src\ciderlib\support\integset.c" />
-    <ClCompile Include="..\src\ciderlib\support\integuse.c" />
-    <ClCompile Include="..\src\ciderlib\support\logfile.c" />
-    <ClCompile Include="..\src\ciderlib\support\mater.c" />
-    <ClCompile Include="..\src\ciderlib\support\misc.c" />
-    <ClCompile Include="..\src\ciderlib\support\mobil.c" />
-    <ClCompile Include="..\src\ciderlib\support\recomb.c" />
-    <ClCompile Include="..\src\ciderlib\support\suprem.c" />
-    <ClCompile Include="..\src\ciderlib\support\suprmitf.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoadmit.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoaval.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twocond.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twocont.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twocurr.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twodest.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twodopng.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoelect.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twofield.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twomesh.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twomobdv.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twomobfn.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twomobil.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoncont.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twopcont.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twopoiss.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoprint.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twoproj.c" />
-    <ClCompile Include="..\src\ciderlib\twod\tworead.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twosetbc.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twosetup.c" />
-    <ClCompile Include="..\src\ciderlib\twod\twosolve.c" />
     <ClCompile Include="..\src\conf.c" />
     <ClCompile Include="..\src\frontend\arg.c" />
     <ClCompile Include="..\src\frontend\aspice.c" />
@@ -1601,6 +1505,7 @@
     <ClCompile Include="..\src\spicelib\analysis\cktpzld.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktpzset.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktpzstr.c" />
+    <ClCompile Include="..\src\spicelib\analysis\cktreliability.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsens.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsetap.c" />
     <ClCompile Include="..\src\spicelib\analysis\cktsetbk.c" />
@@ -1638,6 +1543,10 @@
     <ClCompile Include="..\src\spicelib\analysis\pzan.c" />
     <ClCompile Include="..\src\spicelib\analysis\pzaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\pzsetp.c" />
+    <ClCompile Include="..\src\spicelib\analysis\relananalysis.c" />
+    <ClCompile Include="..\src\spicelib\analysis\relanaskq.c" />
+    <ClCompile Include="..\src\spicelib\analysis\relaninit.c" />
+    <ClCompile Include="..\src\spicelib\analysis\relansetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\sensaskq.c" />
     <ClCompile Include="..\src\spicelib\analysis\senssetp.c" />
     <ClCompile Include="..\src\spicelib\analysis\tfanal.c" />
@@ -1941,6 +1850,7 @@
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4noi.c" />
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4par.c" />
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4pzld.c" />
+    <ClCompile Include="..\src\spicelib\devices\bsim4\b4reliability.c" />
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4set.c" />
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4soachk.c" />
     <ClCompile Include="..\src\spicelib\devices\bsim4\b4temp.c" />
@@ -2415,81 +2325,13 @@
     <ClCompile Include="..\src\spicelib\devices\mos9\mos9supd.c" />
     <ClCompile Include="..\src\spicelib\devices\mos9\mos9temp.c" />
     <ClCompile Include="..\src\spicelib\devices\mos9\mos9trun.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2acld.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2ask.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2del.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2dest.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2dump.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2init.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2load.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2mdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2mpar.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2parm.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2pzld.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2set.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2temp.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt2\nbt2trun.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjt.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtacld.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtask.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtdest.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtdump.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtinit.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtload.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtmdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtmpar.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtparm.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtpzld.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjtset.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjttemp.c" />
-    <ClCompile Include="..\src\spicelib\devices\nbjt\nbjttrun.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2acld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2ask.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2del.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2dest.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2dump.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2load.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2mdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2mpar.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2parm.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2pzld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2set.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2temp.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\nud2trun.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd2\numd2init.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numd.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdacld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdask.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numddel.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numddest.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numddump.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdinit.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdload.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdmdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdmpar.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdparm.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdpzld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdset.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdtemp.c" />
-    <ClCompile Include="..\src\spicelib\devices\numd\numdtrun.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\numm.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummacld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummask.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummdest.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummdump.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummload.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummmdel.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummmpar.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummparm.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummpzld.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummset.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummtemp.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\nummtrun.c" />
-    <ClCompile Include="..\src\spicelib\devices\numos\numosinit.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodel.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelcalcaging.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelcalcfitting.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelinit.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelmask.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelmpar.c" />
+    <ClCompile Include="..\src\spicelib\devices\relmodel\relmodelsetup.c" />
     <ClCompile Include="..\src\spicelib\devices\res\res.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resask.c" />
     <ClCompile Include="..\src\spicelib\devices\res\resdel.c" />