+  if(aVFirst.IsNull() && aVLast.IsNull() && Precision::IsInfinite(aFirst) && Precision::IsInfinite(aLast))
+  if (aVFirst.IsNull() && !Precision::IsNegativeInfinite(aFirst))
+  if (aVLast.IsNull() && !Precision::IsPositiveInfinite(aLast))

+    GeomToStep_MakeCartesianPoint aGTSMCP(gp_Pnt(aFirst, aFirst, aFirst));
+    GeomToStep_MakeCartesianPoint aGTSMCP(gp_Pnt(aLast, aLast, aLast));

+    aSGC = GeomToStep_MakeCurve(aC).Value();

-  Standard_Real First, Last;
-  Handle(Geom_Curve) C = BRep_Tool::Curve(anEdge, First, Last); 
-  if ( ! C.IsNull() ) {
-    if (C->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)))
-      C = Handle(Geom_TrimmedCurve)::DownCast(C)->BasisCurve();
-    GeomToStep_MakeCurve  gtpC(C);

+  if ( ! aC.IsNull() ) {
+    if (aC->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)))
+      aC = Handle(Geom_TrimmedCurve)::DownCast(aC)->BasisCurve();
+    GeomToStep_MakeCurve  gtpC(aC);

   7 catch {Close D}
   8 XNewDoc D
   9 line l1 0 0 0 0 1 0
  10 mkedge e1 l1
  11 XAddShape D e1
  12 WriteStep D $imagedir/${casename}.stp
  13 file delete $imagedir/${casename}.stp

      aSGC = GeomToStep_MakeCurve(aC).Value();
      if (!aSGC.IsNull())
      {
        theCurveList->Append(aSGC);
        return Standard_True;
      }

  // ---------------------------------------
  // Translate 3D representation of the Edge
  // ---------------------------------------
    
    
  // Handle(Geom_Curve) C = CA.Curve().Curve();

  // UPDATE FMA 26-02-96 
  // General remark : this full code should be deaply reworked
  //                  Too many objects are not used !

        aSGC = aGTSML.Value();
        aSGC = MakeTrimmedCurve(aGTSML.Value(), aSGCP1, aSGCP2, 0, aLength, Standard_True);
        //				 (anEdge.Orientation() == TopAbs_FORWARD));
      }

    aSGC = MakeTrimmedCurve(aPMSC, aSGCP1, aSGCP2, aTrim1, aTrim2, Standard_True);
    //			     (anEdge.Orientation() == TopAbs_FORWARD));
  }

Standard_Boolean TopoDSToStep_WireframeBuilder::
  GetTrimmedCurveFromEdge(const TopoDS_Edge& theEdge, 
              const TopoDS_Face& theFace, 
              MoniTool_DataMapOfShapeTransient& theMap, 
              Handle(TColStd_HSequenceOfTransient)& theCurveList) const

+  TopExp_Explorer anExp;
+  for (anExp.Init(anEdge, TopAbs_VERTEX); anExp.More(); anExp.Next())
+  {

+    TopoDS_Vertex aVertex = TopoDS::Vertex(anExp.Value());

+      GeomToStep_MakeCurve aCurveMaker = GeomToStep_MakeCurve(aC);

+  if (theMap.IsBound(anEdge))
+  {
+    aSGC = Handle(StepGeom_Curve)::DownCast ( theMap.Find(anEdge) );