Index: TECH/Timing/Timer.cls.xml
===================================================================
diff -u -r344 -r2149
--- TECH/Timing/Timer.cls.xml	(.../Timer.cls.xml)	(revision 344)
+++ TECH/Timing/Timer.cls.xml	(.../Timer.cls.xml)	(revision 2149)
@@ -66,14 +66,14 @@
 
 <Method name="Start">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Set ..Starttijd = $PIECE(##class(%SYSTEM.SYS).TimeStamp(),",",2)
+<Implementation><![CDATA[	Set ..Starttijd = $zh
 ]]></Implementation>
 </Method>
 
 <Method name="Stop">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	Set Stoptijd = $PIECE(##class(%SYSTEM.SYS).TimeStamp(),",",2)
+	Set Stoptijd = $zh
 	Set ..Duurtijd = 1000 * (Stoptijd - ..Starttijd)
 	Quit ..Duurtijd
 ]]></Implementation>
@@ -105,8 +105,6 @@
 <IndexLocation>^TECH.Timing.TimerI</IndexLocation>
 <StreamLocation>^TECH.Timing.TimerS</StreamLocation>
 <Data name="TimerDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>