Index: sasmodels/models/spherical_sld.c
===================================================================
--- sasmodels/models/spherical_sld.c	(revision 7ef3589faa2fb7c01cdac628103676f15b126214)
+++ sasmodels/models/spherical_sld.c	(revision 4a82d4dd41f712a03b7f365ffe63e370cf57b792)
@@ -2,30 +2,30 @@
 
 double Iq(double q,
-    int n_shells, double sld_solve, int npts_inter,
-    double sld_core_0, double rad_core_0, double thinck_inter_0, int func_inter_0, double nu_inter_0,
-    double sld_flat_1, double thick_inter_1, double thick_flat_1, int func_inter_1, double nu_inter_1,
-    double sld_flat_2, double thick_inter_2, double thick_flat_2, int func_inter_2, double nu_inter_2,
-    double sld_flat_3, double thick_inter_3, double thick_flat_3, int func_inter_3, double nu_inter_3,
-    double sld_flat_4, double thick_inter_4, double thick_flat_4, int func_inter_4, double nu_inter_4,
-    double sld_flat_5, double thick_inter_5, double thick_flat_5, int func_inter_5, double nu_inter_5,
-    double sld_flat_6, double thick_inter_6, double thick_flat_6, int func_inter_6, double nu_inter_6,
-    double sld_flat_7, double thick_inter_7, double thick_flat_7, int func_inter_7, double nu_inter_7,
-    double sld_flat_8, double thick_inter_8, double thick_flat_8, int func_inter_8, double nu_inter_8,
-    double sld_flat_9, double thick_inter_9, double thick_flat_9, int func_inter_9, double nu_inter_9,
-    double sld_flat_10, double thick_inter_10, double thick_flat_10, int func_inter_10, double nu_inter_10);
+    int n_shells, double thick_inter_0, int func_inter_0, double sld_core_0, double sld_solv,
+    double sld_flat_1, double sld_flat_2, double sld_flat_3, double sld_flat_4, double sld_flat_5,
+    double sld_flat_6, double sld_flat_7, double sld_flat_8, double sld_flat_9, double sld_flat_10,
+    double thick_inter_1, double thick_inter_2, double thick_inter_3, double thick_inter_4, double thick_inter_5,
+    double thick_inter_6, double thick_inter_7, double thick_inter_8, double thick_inter_9, double thick_inter_10,
+    double thick_flat_1, double thick_flat_2, double thick_flat_3, double thick_flat_4, double thick_flat_5,
+    double thick_flat_6, double thick_flat_7, double thick_flat_8, double thick_flat_9, double thick_flat_10,
+    int func_inter_1, int func_inter_2, int func_inter_3, int func_inter_4, int func_inter_5,
+    int func_inter_6, int func_inter_7, int func_inter_8, int func_inter_9, int func_inter_10,
+    double nu_inter_1, double nu_inter_2,double nu_inter_3, double nu_inter_4, double nu_inter_5,
+    double nu_inter_6, double nu_inter_7, double nu_inter_8, double nu_inter_9, double nu_inter_10,
+    int npts_inter, double nu_inter_0, double rad_core_0);
 
 double Iqxy(double qx, double qy,
-    int n_shells, double sld_solve, int npts_inter,
-    double sld_core_0, double rad_core_0, double thinck_inter_0, int func_inter_0, double nu_inter_0,
-    double sld_flat_1, double thick_inter_1, double thick_flat_1, int func_inter_1, double nu_inter_1,
-    double sld_flat_2, double thick_inter_2, double thick_flat_2, int func_inter_2, double nu_inter_2,
-    double sld_flat_3, double thick_inter_3, double thick_flat_3, int func_inter_3, double nu_inter_3,
-    double sld_flat_4, double thick_inter_4, double thick_flat_4, int func_inter_4, double nu_inter_4,
-    double sld_flat_5, double thick_inter_5, double thick_flat_5, int func_inter_5, double nu_inter_5,
-    double sld_flat_6, double thick_inter_6, double thick_flat_6, int func_inter_6, double nu_inter_6,
-    double sld_flat_7, double thick_inter_7, double thick_flat_7, int func_inter_7, double nu_inter_7,
-    double sld_flat_8, double thick_inter_8, double thick_flat_8, int func_inter_8, double nu_inter_8,
-    double sld_flat_9, double thick_inter_9, double thick_flat_9, int func_inter_9, double nu_inter_9,
-    double sld_flat_10, double thick_inter_10, double thick_flat_10, int func_inter_10, double nu_inter_10);
+    int n_shells, double thick_inter_0, int func_inter_0, double sld_core_0, double sld_solv,
+    double sld_flat_1, double sld_flat_2, double sld_flat_3, double sld_flat_4, double sld_flat_5,
+    double sld_flat_6, double sld_flat_7, double sld_flat_8, double sld_flat_9, double sld_flat_10,
+    double thick_inter_1, double thick_inter_2, double thick_inter_3, double thick_inter_4, double thick_inter_5,
+    double thick_inter_6, double thick_inter_7, double thick_inter_8, double thick_inter_9, double thick_inter_10,
+    double thick_flat_1, double thick_flat_2, double thick_flat_3, double thick_flat_4, double thick_flat_5,
+    double thick_flat_6, double thick_flat_7, double thick_flat_8, double thick_flat_9, double thick_flat_10,
+    int func_inter_1, int func_inter_2, int func_inter_3, int func_inter_4, int func_inter_5,
+    int func_inter_6, int func_inter_7, int func_inter_8, int func_inter_9, int func_inter_10,
+    double nu_inter_1, double nu_inter_2,double nu_inter_3, double nu_inter_4, double nu_inter_5,
+    double nu_inter_6, double nu_inter_7, double nu_inter_8, double nu_inter_9, double nu_inter_10,
+    int npts_inter, double nu_inter_0, double rad_core_0);
 
 //TODO: Check what is for volume for this model
@@ -189,5 +189,4 @@
   f2 *= scale;
   f2 += background;
-
   //free(fun_type);
   //free(sld);
@@ -206,17 +205,18 @@
  */
 double Iq(double q,
-    int n_shells, double sld_solv, int npts_inter,
-    double sld_core_0, double rad_core_0, double thick_inter_0, int func_inter_0, double nu_inter_0,
-    double sld_flat_1, double thick_inter_1, double thick_flat_1, int func_inter_1, double nu_inter_1,
-    double sld_flat_2, double thick_inter_2, double thick_flat_2, int func_inter_2, double nu_inter_2,
-    double sld_flat_3, double thick_inter_3, double thick_flat_3, int func_inter_3, double nu_inter_3,
-    double sld_flat_4, double thick_inter_4, double thick_flat_4, int func_inter_4, double nu_inter_4,
-    double sld_flat_5, double thick_inter_5, double thick_flat_5, int func_inter_5, double nu_inter_5,
-    double sld_flat_6, double thick_inter_6, double thick_flat_6, int func_inter_6, double nu_inter_6,
-    double sld_flat_7, double thick_inter_7, double thick_flat_7, int func_inter_7, double nu_inter_7,
-    double sld_flat_8, double thick_inter_8, double thick_flat_8, int func_inter_8, double nu_inter_8,
-    double sld_flat_9, double thick_inter_9, double thick_flat_9, int func_inter_9, double nu_inter_9,
-    double sld_flat_10, double thick_inter_10, double thick_flat_10, int func_inter_10, double nu_inter_10) {
-
+    int n_shells, double thick_inter_0, int func_inter_0, double sld_core_0, double sld_solv,
+    double sld_flat_1, double sld_flat_2, double sld_flat_3, double sld_flat_4, double sld_flat_5,
+    double sld_flat_6, double sld_flat_7, double sld_flat_8, double sld_flat_9, double sld_flat_10,
+    double thick_inter_1, double thick_inter_2, double thick_inter_3, double thick_inter_4, double thick_inter_5,
+    double thick_inter_6, double thick_inter_7, double thick_inter_8, double thick_inter_9, double thick_inter_10,
+    double thick_flat_1, double thick_flat_2, double thick_flat_3, double thick_flat_4, double thick_flat_5,
+    double thick_flat_6, double thick_flat_7, double thick_flat_8, double thick_flat_9, double thick_flat_10,
+    int func_inter_1, int func_inter_2, int func_inter_3, int func_inter_4, int func_inter_5,
+    int func_inter_6, int func_inter_7, int func_inter_8, int func_inter_9, int func_inter_10,
+    double nu_inter_1, double nu_inter_2,double nu_inter_3, double nu_inter_4, double nu_inter_5,
+    double nu_inter_6, double nu_inter_7, double nu_inter_8, double nu_inter_9, double nu_inter_10,
+    int npts_inter, double nu_inter_0, double rad_core_0) {
+
+    //printf("Number of points %d\n",npts_inter);
     double intensity;
     //TODO: Remove this container at later stage. It is only kept to minimize stupid errors now
@@ -290,7 +290,6 @@
     dp[59] = rad_core_0;
 
-
     intensity = sphere_sld_kernel(dp,q);
-
+    //printf("%10d\n",intensity);
     return intensity;
 }
@@ -303,30 +302,30 @@
  */
 double Iqxy(double qx, double qy,
-    int n_shells, double sld_solve, int npts_inter,
-    double sld_core_0, double rad_core_0, double thinck_inter_0, int func_inter_0, double nu_inter_0,
-    double sld_flat_1, double thick_inter_1, double thick_flat_1, int func_inter_1, double nu_inter_1,
-    double sld_flat_2, double thick_inter_2, double thick_flat_2, int func_inter_2, double nu_inter_2,
-    double sld_flat_3, double thick_inter_3, double thick_flat_3, int func_inter_3, double nu_inter_3,
-    double sld_flat_4, double thick_inter_4, double thick_flat_4, int func_inter_4, double nu_inter_4,
-    double sld_flat_5, double thick_inter_5, double thick_flat_5, int func_inter_5, double nu_inter_5,
-    double sld_flat_6, double thick_inter_6, double thick_flat_6, int func_inter_6, double nu_inter_6,
-    double sld_flat_7, double thick_inter_7, double thick_flat_7, int func_inter_7, double nu_inter_7,
-    double sld_flat_8, double thick_inter_8, double thick_flat_8, int func_inter_8, double nu_inter_8,
-    double sld_flat_9, double thick_inter_9, double thick_flat_9, int func_inter_9, double nu_inter_9,
-    double sld_flat_10, double thick_inter_10, double thick_flat_10, int func_inter_10, double nu_inter_10) {
+    int n_shells, double thick_inter_0, int func_inter_0, double sld_core_0, double sld_solv,
+    double sld_flat_1, double sld_flat_2, double sld_flat_3, double sld_flat_4, double sld_flat_5,
+    double sld_flat_6, double sld_flat_7, double sld_flat_8, double sld_flat_9, double sld_flat_10,
+    double thick_inter_1, double thick_inter_2, double thick_inter_3, double thick_inter_4, double thick_inter_5,
+    double thick_inter_6, double thick_inter_7, double thick_inter_8, double thick_inter_9, double thick_inter_10,
+    double thick_flat_1, double thick_flat_2, double thick_flat_3, double thick_flat_4, double thick_flat_5,
+    double thick_flat_6, double thick_flat_7, double thick_flat_8, double thick_flat_9, double thick_flat_10,
+    int func_inter_1, int func_inter_2, int func_inter_3, int func_inter_4, int func_inter_5,
+    int func_inter_6, int func_inter_7, int func_inter_8, int func_inter_9, int func_inter_10,
+    double nu_inter_1, double nu_inter_2,double nu_inter_3, double nu_inter_4, double nu_inter_5,
+    double nu_inter_6, double nu_inter_7, double nu_inter_8, double nu_inter_9, double nu_inter_10,
+    int npts_inter, double nu_inter_0, double rad_core_0) {
 
     double q = sqrt(qx*qx + qy*qy);
-    return Iq(q,n_shells, sld_solve, npts_inter,
-    sld_core_0, rad_core_0, thinck_inter_0, func_inter_0, nu_inter_0,
-    sld_flat_1, thick_inter_1, thick_flat_1, func_inter_1, nu_inter_1,
-    sld_flat_2, thick_inter_2, thick_flat_2, func_inter_2, nu_inter_2,
-    sld_flat_3, thick_inter_3, thick_flat_3, func_inter_3, nu_inter_3,
-    sld_flat_4, thick_inter_4, thick_flat_4, func_inter_4, nu_inter_4,
-    sld_flat_5, thick_inter_5, thick_flat_5, func_inter_5, nu_inter_5,
-    sld_flat_6, thick_inter_6, thick_flat_6, func_inter_6, nu_inter_6,
-    sld_flat_7, thick_inter_7, thick_flat_7, func_inter_7, nu_inter_7,
-    sld_flat_8, thick_inter_8, thick_flat_8, func_inter_8, nu_inter_8,
-    sld_flat_9, thick_inter_9, thick_flat_9, func_inter_9, nu_inter_9,
-    sld_flat_10, thick_inter_10, thick_flat_10, func_inter_10, nu_inter_10);
+    return Iq(q, n_shells, thick_inter_0, func_inter_0, sld_core_0, sld_solv,
+    sld_flat_1, sld_flat_2, sld_flat_3, sld_flat_4, sld_flat_5,
+    sld_flat_6, sld_flat_7, sld_flat_8, sld_flat_9, sld_flat_10,
+    thick_inter_1, thick_inter_2, thick_inter_3, thick_inter_4, thick_inter_5,
+    thick_inter_6, thick_inter_7, thick_inter_8, thick_inter_9, thick_inter_10,
+    thick_flat_1, thick_flat_2, thick_flat_3, thick_flat_4, thick_flat_5,
+    thick_flat_6, thick_flat_7, thick_flat_8, thick_flat_9, thick_flat_10,
+    func_inter_1, func_inter_2, func_inter_3, func_inter_4, func_inter_5,
+    func_inter_6, func_inter_7, func_inter_8, func_inter_9, func_inter_10,
+    nu_inter_1, nu_inter_2, nu_inter_3, nu_inter_4, nu_inter_5,
+    nu_inter_6, nu_inter_7, nu_inter_8, nu_inter_9, nu_inter_10,
+    npts_inter, nu_inter_0, rad_core_0);
 
 }
Index: sasmodels/models/spherical_sld.py
===================================================================
--- sasmodels/models/spherical_sld.py	(revision 7ef3589faa2fb7c01cdac628103676f15b126214)
+++ sasmodels/models/spherical_sld.py	(revision 4a82d4dd41f712a03b7f365ffe63e370cf57b792)
@@ -64,64 +64,65 @@
 category = "shere-based"
 
+
 # pylint: disable=bad-whitespace, line-too-long
 #            ["name", "units", default, [lower, upper], "type", "description"],
 parameters = [["n_shells",       "",         1, [0, 9], "", "number of shells"],
+              ["thick_inter_0",       "Ang",         50, [-inf, inf], "", "intern layer thickness"],
+              ["func_inter_0",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["sld_core_0",       "1/Ang^2",         2.07E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_solv",     "1/Ang^2",    1E-6,[-inf, inf], "","sld function solvent"],
+              ["sld_flat_1",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_2",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_3",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_4",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_5",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_6",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_7",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_8",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_9",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
+              ["sld_flat_10",      "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
+              ["thick_inter_1",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_2",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_3",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_4",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_5",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_6",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_7",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_8",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_9",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_inter_10",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
+              ["thick_flat_1",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_2",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_3",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_4",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_5",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_6",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_7",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_8",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_9",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["thick_flat_10",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
+              ["func_inter_1",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_2",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_3",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_4",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_5",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_6",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_7",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_8",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_9",       "",         0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["func_inter_10",       "",        0, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
+              ["nu_inter_1",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_2",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_3",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_4",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_5",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_6",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_7",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_8",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_9",       "",         2.5, [-inf, inf], "", "steepness parameter"],
+              ["nu_inter_10",       "",         2.5, [-inf, inf], "", "steepness parameter"],
               ["npts_inter",  "",         35, [0, inf], "", "number of points in each sublayer"],
-              ["sld_solv",     "1/Ang^2",    1E-6,[-inf, inf], "","sld function solvent"],
-              ["func_inter_0",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
               ["nu_inter_0",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_0",       "Ang",         50, [-inf, inf], "", "intern layer thickness"],
-              ["sld_core_0",       "1/Ang^2",         2.07E-6, [-inf, inf],"", "sld function flat"],
               ["rad_core_0",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["func_inter_1",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_1",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_1",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_1",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_1",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_2",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_2",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_2",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_2",       "1/Ang^2",         3.56E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_2",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_3",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_3",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_3",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_3",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_3",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_4",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_4",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_4",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_4",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_4",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_5",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_5",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_5",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_5",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_5",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_6",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_6",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_6",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_6",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_6",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_7",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_7",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_7",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_7",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_7",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_8",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_8",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_8",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_8",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_8",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_9",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_9",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_9",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_9",       "1/Ang^2",         4.06E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_9",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
-              ["func_inter_10",       "",         3, [0, 4], "", "'Erf(|nu|*z)':0, 'RPower(z^|nu|)':1, 'LPower(z^|nu|)':2, 'RExp(-|nu|*z)':3, 'LExp(-|nu|*z)':4"],
-              ["nu_inter_10",       "",         2.5, [-inf, inf], "", "steepness parameter"],
-              ["thick_inter_10",       "Ang",         50.0, [-inf, inf], "", "intern layer thickness"],
-              ["sld_flat_10",       "1/Ang^2",         3.5E-6, [-inf, inf],"", "sld function flat"],
-              ["thick_flat_10",       "Ang",         100.0, [-inf, inf], "", "flat layer_thickness"],
               ]
 # pylint: enable=bad-whitespace, line-too-long
@@ -159,60 +160,59 @@
         return radius
 
-
 demo = dict(scale=1, background=0.0,
-        n_shells=1,
+        n_shells=10,
         sld_solv=1E-6,
         npts_inter=35,
-        func_inter_0=3,
+        func_inter_0=0,
         nu_inter_0=2.5,
         rad_core_0=50.0,
         sld_core_0=2.07E-6,
         thick_inter_0=50,
-        func_inter_1=3,
+        func_inter_1=0,
         nu_inter_1=2.5,
         thick_inter_1=50,
         sld_flat_1=4E-6,
         thick_flat_1=100,
-        func_inter_2=3,
+        func_inter_2=0,
         nu_inter_2=2.5,
         thick_inter_2=50,
         sld_flat_2=3.5E-6,
         thick_flat_2=100,
-        func_inter_3=3,
+        func_inter_3=0,
         nu_inter_3=2.5,
         thick_inter_3=50,
         sld_flat_3=4E-6,
         thick_flat_3=100,
-        func_inter_4=3,
+        func_inter_4=0,
         nu_inter_4=2.5,
         thick_inter_4=50,
         sld_flat_4=3.5E-6,
         thick_flat_4=100,
-        func_inter_5=3,
+        func_inter_5=0,
         nu_inter_5=2.5,
         thick_inter_5=50,
-        sld_flat_5=3.5E-6,
+        sld_flat_5=4E-6,
         thick_flat_5=100,
-        func_inter_6=3,
+        func_inter_6=0,
         nu_inter_6=2.5,
         thick_inter_6=50,
         sld_flat_6=3.5E-6,
         thick_flat_6=100,
-        func_inter_7=3,
+        func_inter_7=0,
         nu_inter_7=2.5,
         thick_inter_7=50,
         sld_flat_7=4E-6,
         thick_flat_7=100,
-        func_inter_8=3,
+        func_inter_8=0,
         nu_inter_8=2.5,
         thick_inter_8=50,
         sld_flat_8=3.5E-6,
         thick_flat_8=100,
-        func_inter_9=3,
+        func_inter_9=0,
         nu_inter_9=2.5,
         thick_inter_9=50,
         sld_flat_9=4E-6,
         thick_flat_9=100,
-        func_inter_10=3,
+        func_inter_10=0,
         nu_inter_10=2.5,
         thick_inter_10=50,
@@ -221,74 +221,66 @@
         )
 
-oldname = "SphericalSLDModel"
+oldname = "SphereSLDModel"
 oldpars = dict(
         scale="scale",
         background="background",
-        rad_core_0 ="rad_core0",
-        thick_inter_0 = "thick_inter0",
-        nu_inter_0 = "nu_inter0",
-        func_inter_0 = "func_inter0",
-        thick_inter_1 = "thick_inter1",
-        nu_inter_1 = "nu_inter1",
-        func_inter_1 = "func_inter1")
-
-        # n_shells="n_shells",
-        # npts_inter='npts_inter',
-        # sld_solv='sld_solv',
-        # func_inter_0='func_inter0',
-        # nu_inter_0='nu_inter0',
-        # rad_core_0='rad_core0',
-        # sld_core_0='sld_core0',
-        # thick_inter_0='thick_inter0',
-        # func_inter_1='func_inter1',
-        # nu_inter_1='nu_inter1',
-        # thick_inter_1='thick_inter1',
-        # sld_flat_1='sld_flat1',
-        # thick_flat_1='thick_flat1',
-        # func_inter_2='func_inter2',
-        # nu_inter_2='nu_inter2',
-        # thick_inter_2='thick_inter2',
-        # sld_flat_2='sld_flat2',
-        # thick_flat_2='thick_flat2',
-        # func_inter_3='func_inter3',
-        # nu_inter_3='nu_inter3',
-        # thick_inter_3='thick_inter3',
-        # sld_flat_3='sld_flat3',
-        # thick_flat_3='thick_flat3',
-        # func_inter_4='func_inter4',
-        # nu_inter_4='nu_inter4',
-        # thick_inter_4='thick_inter4',
-        # sld_flat_4='sld_flat4',
-        # thick_flat_4='thick_flat4',
-        # func_inter_5='func_inter5',
-        # nu_inter_5='nu_inter5',
-        # thick_inter_5='thick_inter5',
-        # sld_flat_5='sld_flat5',
-        # thick_flat_5='thick_flat5',
-        # func_inter_6='func_inter6',
-        # nu_inter_6='nu_inter6',
-        # thick_inter_6='thick_inter6',
-        # sld_flat_6='sld_flat6',
-        # thick_flat_6='thick_flat6',
-        # func_inter_7='func_inter7',
-        # nu_inter_7='nu_inter7',
-        # thick_inter_7='thick_inter7',
-        # sld_flat_7='sld_flat7',
-        # thick_flat_7='thick_flat7',
-        # func_inter_8='func_inter8',
-        # nu_inter_8='nu_inter8',
-        # thick_inter_8='thick_inter8',
-        # sld_flat_8='sld_flat8',
-        # thick_flat_8='thick_flat8',
-        # func_inter_9='func_inter9',
-        # nu_inter_9='nu_inter9',
-        # thick_inter_9='thick_inter9',
-        # sld_flat_9='sld_flat9',
-        # thick_flat_9='thick_flat9',
-        # func_inter_10='func_inter10',
-        # nu_inter_10='nu_inter10',
-        # thick_inter_10='thick_inter10',
-        # sld_flat_10='sld_flat10',
-        # thick_flat_10='thick_flat10')
+        n_shells="n_shells",
+        npts_inter='npts_inter',
+        sld_solv='sld_solv',
+        func_inter_0='func_inter0',
+        nu_inter_0='nu_inter0',
+        rad_core_0='rad_core0',
+        sld_core_0='sld_core0',
+        thick_inter_0='thick_inter0',
+        func_inter_1='func_inter1',
+        nu_inter_1='nu_inter1',
+        thick_inter_1='thick_inter1',
+        sld_flat_1='sld_flat1',
+        thick_flat_1='thick_flat1',
+        func_inter_2='func_inter2',
+        nu_inter_2='nu_inter2',
+        thick_inter_2='thick_inter2',
+        sld_flat_2='sld_flat2',
+        thick_flat_2='thick_flat2',
+        func_inter_3='func_inter3',
+        nu_inter_3='nu_inter3',
+        thick_inter_3='thick_inter3',
+        sld_flat_3='sld_flat3',
+        thick_flat_3='thick_flat3',
+        func_inter_4='func_inter4',
+        nu_inter_4='nu_inter4',
+        thick_inter_4='thick_inter4',
+        sld_flat_4='sld_flat4',
+        thick_flat_4='thick_flat4',
+        func_inter_5='func_inter5',
+        nu_inter_5='nu_inter5',
+        thick_inter_5='thick_inter5',
+        sld_flat_5='sld_flat5',
+        thick_flat_5='thick_flat5',
+        func_inter_6='func_inter6',
+        nu_inter_6='nu_inter6',
+        thick_inter_6='thick_inter6',
+        sld_flat_6='sld_flat6',
+        thick_flat_6='thick_flat6',
+        func_inter_7='func_inter7',
+        nu_inter_7='nu_inter7',
+        thick_inter_7='thick_inter7',
+        sld_flat_7='sld_flat7',
+        thick_flat_7='thick_flat7',
+        func_inter_8='func_inter8',
+        nu_inter_8='nu_inter8',
+        thick_inter_8='thick_inter8',
+        sld_flat_8='sld_flat8',
+        thick_flat_8='thick_flat8',
+        func_inter_9='func_inter9',
+        nu_inter_9='nu_inter9',
+        thick_inter_9='thick_inter9',
+        sld_flat_9='sld_flat9',
+        thick_flat_9='thick_flat9',
+        func_inter_10='func_inter10',
+        nu_inter_10='nu_inter10',
+        thick_inter_10='thick_inter10',
+        sld_flat_10='sld_flat10',
+        thick_flat_10='thick_flat10')
 
 tests = [
