Geopak Drainage - Elliptical pipes not drawing correctly in cross section view

I have been having an issue with the criteria not drawing elliptical pipes to the correct “span”.  I have made the below changes in the PIPE.X criteria file which has resolved the problem in areas where there is no structure bottom.  But for some reason the elliptical pipes drawn within the confines of a structure bottom are still drawing with an improper “span”.  Having these pipes draw correctly assists with verifying the correct structure bottom is being utilized as well as conflict identification / resolution.

Changes to attached PIPE.X occur on the following lines:

 

Line #

43                           -              Changed _d_LinkRise = Drainage Link Span to _d_Link_Span = Drainage Link Span

50                           -              Changed _d_Link_Span =cvt_d_s0(_d_LinkRise*12) + ^”^  to _d_Link_Span =cvt_d_s0(_d_Link_Span*12) + ^”^  

293 & 352             -              Changed draw cell = xpipe xs=_d_scale ys=_d_scale * _d_ratio to the below

                                                {

                                                 if (_s_link_shape = "Ellipse") then

                                                                {                                                                             

                                                                draw cell = xpipe xs=_d_link_span ys=_d_scale*_d_ratio/* PLACES PIPE CELL (AS ELLIPSE) AT BOTTOM STARTING POINT */

                                                                }

                                                                else

                                                                {

                                                                _d_scale = _d_link_rise

                                                                draw cell = xpipe xs=_d_scale ys=_d_scale*_d_ratio/* PLACES PIPE CELL AT BOTTOM STARTING POINT */

                                                                }

                                                }