diff --git a/chamsin/src/analogic/GenV1Trans.cpp b/chamsin/src/analogic/GenV1Trans.cpp
index af904b3c..034d9870 100644
--- a/chamsin/src/analogic/GenV1Trans.cpp
+++ b/chamsin/src/analogic/GenV1Trans.cpp
@@ -311,7 +311,7 @@ void GenV1Trans::Calculate(Transistor* transistor)
 void GenV1Trans::Generate(Transistor* transistor)
 // *********************************************
 {
-  openUpdateSession();
+    UpdateSession::open();
 
   Net* source = transistor->getNet(Name(transistor->getSourceName())); 
   Net* drain  = transistor->getNet(Name(transistor->getDrainName()) ); 
@@ -472,7 +472,7 @@ END_IF
   // End Generation.
   // -------------------------------------------------------------
 
-  closeUpdateSession();
+  UpdateSession::close();
 
   // Set Transistor::_mapNet2Box.  
   // ****************************
diff --git a/chamsin/src/analogic/MetaTransistor.cpp b/chamsin/src/analogic/MetaTransistor.cpp
index a05f1025..c555a9f2 100644
--- a/chamsin/src/analogic/MetaTransistor.cpp
+++ b/chamsin/src/analogic/MetaTransistor.cpp
@@ -77,7 +77,6 @@ void MetaTransistor::createConnection()
 void MetaTransistor::createLayout()
 // ********************************
 {
-//  OpenUpdateSession();
   
   if((_le == 0.0) || (_we == 0.0)) {
      throw Error("Can't generate layout : " + getString(this) + " hasn't been dimensionned");
@@ -132,7 +131,6 @@ void MetaTransistor::createLayout()
   
 
   materialize();
- // CloseUpdateSession();
 
 }
 
@@ -140,14 +138,14 @@ void MetaTransistor::createLayout()
 void MetaTransistor::Flush()
 // *************************
 {
-  openUpdateSession();
+  UpdateSession::open();
   for_each_instance(instance, this->getInstances()) { 
     Cell * mastercell = instance->getMasterCell();
     instance->destroy();     
     mastercell->destroy();
     end_for
   }
-  closeUpdateSession();
+  UpdateSession::close();
 }  
 
 
diff --git a/chamsin/src/analogic/Transistor.cpp b/chamsin/src/analogic/Transistor.cpp
index f3850c1e..cdc2c530 100644
--- a/chamsin/src/analogic/Transistor.cpp
+++ b/chamsin/src/analogic/Transistor.cpp
@@ -409,7 +409,7 @@ void Transistor::createLayout()
 void Transistor::duplicateLayout(Transistor* transistor)
 // *****************************************************
 {
-   openUpdateSession();
+   UpdateSession::open();
 
    setTerminal(false);
 
@@ -455,7 +455,7 @@ void Transistor::duplicateLayout(Transistor* transistor)
 
    materialize();   
 
-   closeUpdateSession();
+   UpdateSession::close();
 
 }  
 
diff --git a/chamsin/src/device/TrMos_PlaceRoute.cpp b/chamsin/src/device/TrMos_PlaceRoute.cpp
index 47de0ed4..76ecb557 100644
--- a/chamsin/src/device/TrMos_PlaceRoute.cpp
+++ b/chamsin/src/device/TrMos_PlaceRoute.cpp
@@ -99,15 +99,12 @@ void TrMos::_PlaceAndRoute()
    verticalHighMargin  = MAX_INTEGER(verticalHighMargin, horizontalMargin + getUnit(2*rdAlu2 + 2*widthOfDrainWire) );
    horizontalMargin    = MAX_INTEGER(horizontalMargin, getUnit(RETURN_EVEN(rdImp + widthOfImp/2)) );
 
-   openUpdateSession();
+   UpdateSession::open();
 
    if(_m ==  1 ) {  // If there is only one finger.
      _Place( instance, Transformation::Orientation::ID, Point( horizontalMargin, verticalLowMargin ) );
-     //CloseUpdateSession();
-     //return;
 
-   }
-   else {   
+   } else {   
      // get instance who's model's abutment type is Left or Right.
      // ************************************************************
      for_each_occurrence(occurrence, getLeafInstanceOccurrences())
@@ -121,8 +118,7 @@ void TrMos::_PlaceAndRoute()
              rightins = instance;
           else if ( trans->isRight())
              rightins = instance;
-        }
-        else {
+        } else {
           if(trans->isRight() && !leftins)
             leftins = instance;
           else if (trans->isRight() && leftins )
@@ -179,7 +175,7 @@ void TrMos::_PlaceAndRoute()
      
    }  
 
-   closeUpdateSession();
+   UpdateSession::close();
 
 
 
@@ -190,7 +186,7 @@ void TrMos::_PlaceAndRoute()
     instance->materialize();      
    end_for
 
-   openUpdateSession();
+   UpdateSession::open();
 
 
    cout <<"Bounding box of TrMos is "<<getString(getBoundingBox())<<endl;
@@ -680,7 +676,7 @@ void TrMos::_PlaceAndRoute()
             );
    }   
 
-   closeUpdateSession();
+   UpdateSession::close();
 
 }