--- a/MemoryUsageView.st	Fri Jul 10 12:57:05 2015 +0200
+++ b/MemoryUsageView.st	Fri Jul 10 21:53:11 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1992 by Claus Gittinger
 	      All Rights Reserved
@@ -135,7 +137,7 @@
     self label:'Memory Usage'.
 
     headLine := ' Class' paddedTo:47 with:Character space.
-    headLine := headLine , '# of Insts     Bytes   Avg sz   Max sz   %Mem  %Accum. +Insts    +Bytes'.
+    headLine := headLine , '  # of Insts       Bytes   Avg sz   Max sz   %Mem  %Accum. +Insts    +Bytes'.
 
     titleLabel := Label in:self.
     titleLabel origin:(0.0 @ 0.0) corner:(1.0 @ titleLabel preferredHeight).
@@ -638,10 +640,10 @@
                 ].
             ]
         ].
+        aBlock value:insts
     ] ifFalse:[
-        insts := class allInstances.
+        ObjectMemory allInstancesOf:class do:aBlock.
     ].
-    aBlock value:insts
 
     "Created: / 11-05-2011 / 14:36:00 / cg"
 ! !
@@ -795,8 +797,8 @@
     rawInfo isNil ifTrue:[^ self].
 
     nameLen := 50.
-    countLen := 7.
-    bytesUsedSize := 10.
+    countLen := 9.
+    bytesUsedSize := 12.
     avgSizeLen := 10.
     maxSizeLen := 8.
     accumMemoryUseLen := 7.
@@ -1110,10 +1112,10 @@
 !MemoryUsageView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.70 2015-02-23 17:04:48 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.70 2015-02-23 17:04:48 cg Exp $'
+    ^ '$Header$'
 ! !