diff --git a/VERSION b/VERSION
index 012b7f9c..74853a61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-25 16:19:46) dev
+Version 2.00.0 (2012-08-25 18:42:23) dev
diff --git a/gluon/storage.py b/gluon/storage.py
index 50c2b9f8..74611c6d 100644
--- a/gluon/storage.py
+++ b/gluon/storage.py
@@ -38,10 +38,15 @@ class Storage(dict):
         >>> print o.a
         None
     """
+    __slots__=()
+    
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
     __getitem__ = dict.get
     __getattr__ = dict.get
+    __repr__ = lambda self: '<Storage %s>' % dict.__repr__(self)
+    __getstate__ = dict
+    __setstate__ = dict.update
     # def __getattr__(self, key):
     #    return dict.get(self, key, None)
     # def __setattr__(self, key, value):
@@ -50,12 +55,12 @@ class Storage(dict):
     #    return dict.get(self, key, None)
     # def __delattr__(self, key):
     #    del self[key]
-    def __repr__(self):
-        return '<Storage %s>' % dict.__repr__(self)
-    def __getstate__(self):
-        return dict(self)
-    def __setstate__(self,values):
-        self.update(values)
+    # def __repr__(self):
+    #     return '<Storage %s>' % dict.__repr__(self)
+    # def __getstate__(self):
+    #     return dict(self)
+    # def __setstate__(self,values):
+    #     self.update(values)
 
     def getlist(self,key):
         """