Index: sansmodels/src/sans/models/c_extensions/prolate.c
===================================================================
--- sansmodels/src/sans/models/c_extensions/prolate.c	(revision 27a0771a6ddbafb74959fa451e80b17dcd5ca5ed)
+++ sansmodels/src/sans/models/c_extensions/prolate.c	(revision 8dc0b74600a8db8ce463144695eb91a5449d193c)
@@ -18,6 +18,6 @@
  */
 double prolate_analytical_1D(ProlateParameters *pars, double q) {
-	double dp[10];
-	
+	double dp[8];
+
 	// Fill paramater array
 	dp[0] = pars->scale;
@@ -29,9 +29,7 @@
 	dp[6] = pars->sld_solvent;
 	dp[7] = pars->background;
-	dp[8] = pars->axis_theta;
-	dp[9] = pars->axis_phi;
-	
+
 	// Call library function to evaluate model
-	return ProlateForm(dp, q);	
+	return ProlateForm(dp, q);
 }
 
@@ -45,6 +43,6 @@
 	double q;
 	q = sqrt(qx*qx+qy*qy);
-    return prolate_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+    return prolate_analytical_1D(pars, q);
+}
 
 
@@ -57,7 +55,7 @@
  */
 double prolate_analytical_2D(ProlateParameters *pars, double q, double phi) {
-    return prolate_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
+    return prolate_analytical_1D(pars, q);
+}
+
 /**
  * Function to evaluate 2D scattering function
@@ -68,7 +66,7 @@
  * @return: function value
  */
-double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y) {
-	
-	return 1.0;
-}
-    
+//double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y) {
+//
+//	return 1.0;
+//}
+
Index: sansmodels/src/sans/models/c_extensions/prolate.h
===================================================================
--- sansmodels/src/sans/models/c_extensions/prolate.h	(revision 27a0771a6ddbafb74959fa451e80b17dcd5ca5ed)
+++ sansmodels/src/sans/models/c_extensions/prolate.h	(revision 8dc0b74600a8db8ce463144695eb91a5449d193c)
@@ -3,12 +3,25 @@
 /** Structure definition for prolate parameters
  * [PYTHONCLASS] = ProlateModel
- * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell, axis_theta, axis_phi
-   [DESCRIPTION] = <text> Calculates the form factor for a monodisperse prolate ellipsoid particle with a
-						core/shell structure
-						Note:It is the users' responsibility to ensure that shell radii are larger than core radii, and
-					that major radii are larger than minor radii.</text>
-
-   [FIXED] = <text>axis_phi.width; axis_theta.width; major_core.width;minor_core.width; major_shell; minor_shell</text>
-   [ORIENTATION_PARAMS] = <text>axis_phi; axis_theta; axis_phi.width; axis_theta.width</text>
+ * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell
+   [DESCRIPTION] = <text>[ProlateCoreShellModel] Calculates the form factor for a prolate
+			ellipsoid particle with a core_shell structure.
+			The form factor is averaged over all possible
+			orientations of the ellipsoid such that P(q)
+			= scale*<f^2>/Vol + bkg, where f is the
+			single particle scattering amplitude.
+			[Parameters]:
+			major_core = radius of major_core,
+			minor_core = radius of minor_core,
+			major_shell = radius of major_shell,
+			minor_shell = radius of minor_shell,
+			contrast = SLD_core - SLD_shell
+			sld_solvent = SLD_solvent
+			background = Incoherent bkg
+			scale = scale
+			Note:It is the users' responsibility to ensure
+			that shell radii are larger than core radii.
+			</text>
+   [FIXED] = <text>major_core.width;minor_core.width; major_shell.width; minor_shell.width</text>
+   [ORIENTATION_PARAMS] =
 
  **/
@@ -38,10 +51,4 @@
 	//  [DEFAULT]=background=0.001 [1/cm]
 	double background;
-    /// Orientation of the prolate axis w/respect incoming beam [rad]
-    //  [DEFAULT]=axis_theta=1.0 [rad]
-    double axis_theta;
-    /// Orientation of the prolate in the plane of the detector [rad]
-    //  [DEFAULT]=axis_phi=1.0 [rad]
-    double axis_phi;
 
 } ProlateParameters;
@@ -55,5 +62,5 @@
 double prolate_analytical_2D(ProlateParameters *pars, double q, double phi);
 double prolate_analytical_2DXY(ProlateParameters *pars, double qx, double qy);
-double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y);
+//double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y);
 
 #endif
