--- trunk/src/primitives/Molecule.cpp	2005/01/12 22:41:40	246
+++ trunk/src/primitives/Molecule.cpp	2005/03/07 22:39:33	398
@@ -61,14 +61,14 @@ Molecule::~Molecule() {
 
 Molecule::~Molecule() {
 
-    MemoryUtils::deleteVectorOfPointer(atoms_);
-    MemoryUtils::deleteVectorOfPointer(bonds_);
-    MemoryUtils::deleteVectorOfPointer(bends_);
-    MemoryUtils::deleteVectorOfPointer(torsions_);
-    MemoryUtils::deleteVectorOfPointer(rigidBodies_);
-    MemoryUtils::deleteVectorOfPointer(cutoffGroups_);
-    MemoryUtils::deleteVectorOfPointer(constraintPairs_);
-    MemoryUtils::deleteVectorOfPointer(constraintElems_);
+    MemoryUtils::deletePointers(atoms_);
+    MemoryUtils::deletePointers(bonds_);
+    MemoryUtils::deletePointers(bends_);
+    MemoryUtils::deletePointers(torsions_);
+    MemoryUtils::deletePointers(rigidBodies_);
+    MemoryUtils::deletePointers(cutoffGroups_);
+    MemoryUtils::deletePointers(constraintPairs_);
+    MemoryUtils::deletePointers(constraintElems_);
     //integrableObjects_ don't own the objects
     integrableObjects_.clear();
     
@@ -160,8 +160,10 @@ void Molecule::complete() {
     //    painCave.isFatal = 1;
     //    simError();        
     //}
-
-    integrableObjects_.insert(integrableObjects_.end(), rigidBodies_.begin(), rigidBodies_.end());
+    for (rb = beginRigidBody(rbIter); rb != NULL; rb = nextRigidBody(rbIter)) {
+      integrableObjects_.push_back(rb);
+    } 
+    //integrableObjects_.insert(integrableObjects_.end(), rigidBodies_.begin(), rigidBodies_.end());
 }
 
 double Molecule::getMass() {