diff --git a/Project/Sources/Forms/D_MultiProgress_Mac/method.4dm b/Project/Sources/Forms/D_MultiProgress_Mac/method.4dm
index 63e14b7..a23b652 100644
--- a/Project/Sources/Forms/D_MultiProgress_Mac/method.4dm
+++ b/Project/Sources/Forms/D_MultiProgress_Mac/method.4dm
@@ -1,5 +1,5 @@
-C_POINTER:C301($NilPtr)
-C_LONGINT:C283($SubformWidth; $SubformHeight)
+// var $NilPtr : Pointer
+var $SubformWidth; $SubformHeight : Integer
 
 Case of 
 	: (Form event code:C388=On Load:K2:1)
diff --git a/Project/Sources/Forms/D_MultiProgress_Win/method.4dm b/Project/Sources/Forms/D_MultiProgress_Win/method.4dm
index a4fe608..53494b6 100644
--- a/Project/Sources/Forms/D_MultiProgress_Win/method.4dm
+++ b/Project/Sources/Forms/D_MultiProgress_Win/method.4dm
@@ -1,5 +1,5 @@
-C_POINTER:C301($NilPtr)
-C_LONGINT:C283($SubformWidth; $SubformHeight)
+// var $NilPtr: Pointer
+var $SubformWidth; $SubformHeight : Integer
 
 Case of 
 	: (Form event code:C388=On Load:K2:1)
diff --git a/Project/Sources/Methods/Progress Get Button Enabled.4dm b/Project/Sources/Methods/Progress Get Button Enabled.4dm
index c38bbb1..3f3148d 100644
--- a/Project/Sources/Methods/Progress Get Button Enabled.4dm	
+++ b/Project/Sources/Methods/Progress Get Button Enabled.4dm	
@@ -1,22 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_BOOLEAN:C305($0)
+#DECLARE($ProgressID : Integer) : Boolean
 
-C_TEXT:C284($Message)
-
-C_LONGINT:C283($p)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
-
-C_BOOLEAN:C305($CancelAllow)
-
-C_TEXT:C284($Error)
+var $p : Integer
+var $ErrorID : Integer
+var $CancelAllow : Boolean
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -34,7 +24,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$CancelAllow
+return $CancelAllow
 
 
 
diff --git a/Project/Sources/Methods/Progress Get Button Title.4dm b/Project/Sources/Methods/Progress Get Button Title.4dm
index b674808..439c14c 100644
--- a/Project/Sources/Methods/Progress Get Button Title.4dm	
+++ b/Project/Sources/Methods/Progress Get Button Title.4dm	
@@ -1,17 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($0)
+#DECLARE($ProgressID : Integer) : Text
 
-C_TEXT:C284($Title)
-C_LONGINT:C283($p)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $Title : Text
+var $p : Integer
+var $ErrorID : Integer
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -29,7 +24,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Title
+return $Title
 
 
 
diff --git a/Project/Sources/Methods/Progress Get Icon.4dm b/Project/Sources/Methods/Progress Get Icon.4dm
index c93d6c1..6fdff80 100644
--- a/Project/Sources/Methods/Progress Get Icon.4dm	
+++ b/Project/Sources/Methods/Progress Get Icon.4dm	
@@ -1,17 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_PICTURE:C286($0)
+#DECLARE($ProgressID : Integer) : Picture
 
-C_PICTURE:C286($Icon)
-C_LONGINT:C283($p)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $Icon : Picture
+var $p : Integer
+var $ErrorID : Integer
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -28,7 +23,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Icon
+return $Icon
 
 
 
diff --git a/Project/Sources/Methods/Progress Get Message.4dm b/Project/Sources/Methods/Progress Get Message.4dm
index 42b33d8..229e823 100644
--- a/Project/Sources/Methods/Progress Get Message.4dm	
+++ b/Project/Sources/Methods/Progress Get Message.4dm	
@@ -1,19 +1,15 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($0)
+#DECLARE($ProgressID : Integer) : Text
 
-C_TEXT:C284($Message)
-C_LONGINT:C283($p)
-C_TEXT:C284($Error)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_TEXT:C284($ErrorText)  // error text
-C_LONGINT:C283($ProgressID)
+var $Message : Text
+var $p : Integer
+var $Error : Text
+
+var $ErrorID : Integer
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -31,7 +27,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Message
+return $Message
 
 
 
diff --git a/Project/Sources/Methods/Progress Get On Error Method.4dm b/Project/Sources/Methods/Progress Get On Error Method.4dm
index 0519bf7..c0968eb 100644
--- a/Project/Sources/Methods/Progress Get On Error Method.4dm	
+++ b/Project/Sources/Methods/Progress Get On Error Method.4dm	
@@ -1,4 +1,4 @@
 //%attributes = {"invisible":true,"shared":true}
+#DECLARE() : Text
 
-C_TEXT:C284($0)  //callback method name
-$0:=<>OnErrorMethod
+return <>OnErrorMethod
diff --git a/Project/Sources/Methods/Progress Get On Stop Method.4dm b/Project/Sources/Methods/Progress Get On Stop Method.4dm
index cab3378..b220bfa 100644
--- a/Project/Sources/Methods/Progress Get On Stop Method.4dm	
+++ b/Project/Sources/Methods/Progress Get On Stop Method.4dm	
@@ -1,18 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($0)
+#DECLARE($ProgressID : Integer) : Text
 
-C_TEXT:C284($OnStopMethod)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)
-
-C_LONGINT:C283($p)
+var $OnStopMethod : Text
+var $ErrorID : Integer
+var $p : Integer
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -30,7 +24,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$OnStopMethod
+return $OnStopMethod
 
 
 
diff --git a/Project/Sources/Methods/Progress Get Progress.4dm b/Project/Sources/Methods/Progress Get Progress.4dm
index 1bb67ee..a7c15d6 100644
--- a/Project/Sources/Methods/Progress Get Progress.4dm	
+++ b/Project/Sources/Methods/Progress Get Progress.4dm	
@@ -1,22 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_REAL:C285($0)
+#DECLARE($ProgressID : Integer) : Real
 
-C_TEXT:C284($Message)
-
-C_LONGINT:C283($p)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
-
-C_REAL:C285($Value)
-
-C_TEXT:C284($Error)
+var $p : Integer
+var $ErrorID : Integer
+var $Value : Real
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -34,7 +24,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Value
+return $Value
 
 
 
diff --git a/Project/Sources/Methods/Progress Get Title.4dm b/Project/Sources/Methods/Progress Get Title.4dm
index 967471b..63ce552 100644
--- a/Project/Sources/Methods/Progress Get Title.4dm	
+++ b/Project/Sources/Methods/Progress Get Title.4dm	
@@ -1,17 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($0)
+#DECLARE($ProgressID : Integer) : Text
 
-C_TEXT:C284($Title)
-C_LONGINT:C283($p)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $Title : Text
+var $p : Integer
+var $ErrorID : Integer
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
@@ -29,7 +24,7 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Title
+return $Title
 
 
 
diff --git a/Project/Sources/Methods/Progress New.4dm b/Project/Sources/Methods/Progress New.4dm
index 91569ee..e3652f9 100644
--- a/Project/Sources/Methods/Progress New.4dm	
+++ b/Project/Sources/Methods/Progress New.4dm	
@@ -1,13 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_BOOLEAN:C305($1)  //set to front (or not if not passed)
+#DECLARE() : Integer
 
-C_LONGINT:C283($0)
-C_LONGINT:C283($N; $NextID)
+var $N; $NextID : Integer
 
 Progress__Compiler
 
-C_PICTURE:C286($Image)
-C_TEXT:C284($Path; $Sep)
+var $Image : Picture
+var $Path; $Sep : Text
 
 Progress__Semaphore_ON  //*************
 
@@ -57,6 +56,6 @@ If (Count parameters:C259>=1)
 	BRING TO FRONT:C326(<>PS_Progress)
 End if 
 
-$0:=$NextID
+return $NextID
 
 
diff --git a/Project/Sources/Methods/Progress QUIT.4dm b/Project/Sources/Methods/Progress QUIT.4dm
index 23ab5d6..d60915f 100644
--- a/Project/Sources/Methods/Progress QUIT.4dm	
+++ b/Project/Sources/Methods/Progress QUIT.4dm	
@@ -1,13 +1,11 @@
 //%attributes = {"invisible":true,"shared":true}
+#DECLARE($ProgressID : Integer)
 // should be called by host before leaving
 
-C_LONGINT:C283($1)  //Reference of Progress to stop
+var $ErrorID : Integer
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
-
-C_LONGINT:C283($i; $p; $n)
-C_TEXT:C284($Error)
+var $i; $p; $n : Integer
+var $Error : Text
 
 $Error:=""
 
@@ -15,8 +13,6 @@ If (Count parameters:C259>=1)
 	
 	Progress__Semaphore_ON  //*************
 	
-	$ProgressID:=$1
-	
 	If ($ProgressID=0)
 		
 		<>ProgressInited:=False:C215
diff --git a/Project/Sources/Methods/Progress SET BUTTON ENABLED.4dm b/Project/Sources/Methods/Progress SET BUTTON ENABLED.4dm
index 9f1b99a..da31d46 100644
--- a/Project/Sources/Methods/Progress SET BUTTON ENABLED.4dm	
+++ b/Project/Sources/Methods/Progress SET BUTTON ENABLED.4dm	
@@ -1,26 +1,15 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  // Reference of Progress
-C_BOOLEAN:C305($2)  // Mandatory (allow or nor)
-C_BOOLEAN:C305($3)  // If passed then the progress window becomes the foreground window
+#DECLARE($ProgressID : Integer; $CancelAllow : Boolean; $FrontMost : Boolean)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer
 
-C_LONGINT:C283($p; $CountParam)
+var $p : Integer
 
-C_TEXT:C284($Title)
-C_REAL:C285($Progress)
-C_BOOLEAN:C305($CancelAllow)
-C_PICTURE:C286($Icon)
-C_BOOLEAN:C305($FrontMost)
+var $Title : Text
+var $Progress : Real
+var $Icon : Picture
 
-$CountParam:=Count parameters:C259
-If ($CountParam>=2)
-	$ProgressID:=$1
-	$CancelAllow:=$2
-	If ($CountParam>=3)
-		$FrontMost:=$3
-	End if 
+If (Count parameters:C259>=2)
 	
 	Progress__Semaphore_ON  //*************
 	
diff --git a/Project/Sources/Methods/Progress SET BUTTON TITLE.4dm b/Project/Sources/Methods/Progress SET BUTTON TITLE.4dm
index 829afeb..1dcd420 100644
--- a/Project/Sources/Methods/Progress SET BUTTON TITLE.4dm	
+++ b/Project/Sources/Methods/Progress SET BUTTON TITLE.4dm	
@@ -1,23 +1,10 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($2)  // mandatory (title)
-C_BOOLEAN:C305($3)  //If passed then the progress window becomes the foreground window
+#DECLARE($ProgressID : Integer; $CancelButtonText : Text; $FrontMost : Boolean)
 
-C_LONGINT:C283($ProgressID)  // progress code
-C_TEXT:C284($CancelButtonText)
-C_BOOLEAN:C305($FrontMost)
+var $ErrorID : Integer
+var $p : Integer
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($p; $CountParam)
-
-$CountParam:=Count parameters:C259
-If ($CountParam>=2)
-	
-	$ProgressID:=$1
-	$CancelButtonText:=$2
-	If ($CountParam>=3)
-		$FrontMost:=$3
-	End if 
+If (Count parameters:C259>=2)
 	
 	Progress__Semaphore_ON  //*************
 	
diff --git a/Project/Sources/Methods/Progress SET FONT SIZES.4dm b/Project/Sources/Methods/Progress SET FONT SIZES.4dm
index 79c5e7a..02c9afa 100644
--- a/Project/Sources/Methods/Progress SET FONT SIZES.4dm	
+++ b/Project/Sources/Methods/Progress SET FONT SIZES.4dm	
@@ -1,24 +1,21 @@
 //%attributes = {"invisible":true,"shared":true}
+#DECLARE($sizeMessage1 : Integer; $sizeMessage2 : Integer; $sizeStopButton : Integer)
 
-C_LONGINT:C283($1)  // mandatory (Title size)
-C_LONGINT:C283($2)
-C_LONGINT:C283($3)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($CountParam)
+var $ErrorID : Integer
+var $CountParam : Integer
 
 $CountParam:=Count parameters:C259
 If ($CountParam>=1)
-	If ($1>0)
-		<>SizeMessage1:=$1
+	If ($sizeMessage1>0)
+		<>SizeMessage1:=$sizeMessage1
 	End if 
 	If ($CountParam>=2)
-		If ($2>0)
-			<>SizeMessage2:=$2
+		If ($sizeMessage2>0)
+			<>SizeMessage2:=$sizeMessage2
 		End if 
 		If ($CountParam>=3)
-			If ($3>0)
-				<>SizeStopButton:=$3
+			If ($sizeStopButton>0)
+				<>SizeStopButton:=$sizeStopButton
 			End if 
 		End if 
 	End if 
diff --git a/Project/Sources/Methods/Progress SET FONTS.4dm b/Project/Sources/Methods/Progress SET FONTS.4dm
index ef9320c..8842427 100644
--- a/Project/Sources/Methods/Progress SET FONTS.4dm	
+++ b/Project/Sources/Methods/Progress SET FONTS.4dm	
@@ -1,24 +1,21 @@
 //%attributes = {"invisible":true,"shared":true}
+#DECLARE($fontMessage1 : Text; $fontMessage2 : Text; $fontStopButton : Text)
 
-C_TEXT:C284($1)  // mandatory (Title font)
-C_TEXT:C284($2)
-C_TEXT:C284($3)
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($CountParam)
+var $ErrorID : Integer
+var $CountParam : Integer
 
 $CountParam:=Count parameters:C259
 If ($CountParam>=1)
-	If ($1#"")
-		<>FontMessage1:=$1
+	If ($fontMessage1#"")
+		<>FontMessage1:=$fontMessage1
 	End if 
 	If ($CountParam>=2)
-		If ($2#"")
-			<>FontMessage2:=$2
+		If ($fontMessage2#"")
+			<>FontMessage2:=$fontMessage2
 		End if 
 		If ($CountParam>=3)
-			If ($3#"")
-				<>FontStopButton:=$3
+			If ($fontStopButton#"")
+				<>FontStopButton:=$fontStopButton
 			End if 
 		End if 
 	End if 
diff --git a/Project/Sources/Methods/Progress SET ICON.4dm b/Project/Sources/Methods/Progress SET ICON.4dm
index 33e462a..fc23aa6 100644
--- a/Project/Sources/Methods/Progress SET ICON.4dm	
+++ b/Project/Sources/Methods/Progress SET ICON.4dm	
@@ -1,28 +1,10 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  // Reference of Progress
-C_PICTURE:C286($2)  // icon
-C_BOOLEAN:C305($3)  // forces foreground window if passed
+#DECLARE($ProgressID : Integer; $Icon : Picture; $FrontMost : Boolean)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer
+var $p : Integer
 
-C_LONGINT:C283($p; $CountParam)
-C_TEXT:C284($Error)
-
-C_TEXT:C284($Title)
-C_REAL:C285($Progress)
-C_TEXT:C284($Message)
-C_PICTURE:C286($Icon)
-C_BOOLEAN:C305($FrontMost)
-
-$CountParam:=Count parameters:C259
-If ($CountParam>=2)
-	
-	$ProgressID:=$1
-	$Icon:=$2
-	If (Count parameters:C259>=3)
-		$FrontMost:=$3
-	End if 
+If (Count parameters:C259>=2)
 	
 	Progress__Semaphore_ON  //*************
 	
diff --git a/Project/Sources/Methods/Progress SET MESSAGE.4dm b/Project/Sources/Methods/Progress SET MESSAGE.4dm
index c58308e..00b3e0e 100644
--- a/Project/Sources/Methods/Progress SET MESSAGE.4dm	
+++ b/Project/Sources/Methods/Progress SET MESSAGE.4dm	
@@ -1,33 +1,16 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($2)  // Mandatory (Message)
-C_BOOLEAN:C305($3)  //if passed, forces the window to be the frontmost window
+#DECLARE($ProgressID : Integer; $Message : Text; $FrontMost : Boolean)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer
+var $p : Integer
 
-C_LONGINT:C283($p; $CountParam)
-
-C_TEXT:C284($Title)
-C_REAL:C285($Progress)
-C_TEXT:C284($Message)
-C_PICTURE:C286($Icon)
-C_BOOLEAN:C305($FrontMost)
-
-$CountParam:=Count parameters:C259
-If ($CountParam>=2)
-	$ProgressID:=$1
-	$Message:=$2
-	If ($CountParam>=3)
-		$FrontMost:=$3
-	End if 
+If (Count parameters:C259>=2)
 	
 	Progress__Semaphore_ON  //*************
 	
-	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
 	If ($p>0)
-		<>_ProgressMessage{$p}:=$2
+		<>_ProgressMessage{$p}:=$Message
 		<>_ProgressUpdated{$p}:=True:C214
 	Else 
 		$ErrorID:=1  //Bad ID
diff --git a/Project/Sources/Methods/Progress SET ON ERROR METHOD.4dm b/Project/Sources/Methods/Progress SET ON ERROR METHOD.4dm
index cbe759b..1b687ba 100644
--- a/Project/Sources/Methods/Progress SET ON ERROR METHOD.4dm	
+++ b/Project/Sources/Methods/Progress SET ON ERROR METHOD.4dm	
@@ -1,9 +1,9 @@
 //%attributes = {"invisible":true,"shared":true}
-C_TEXT:C284($1)  //callback method name
-C_TEXT:C284($Error)
+#DECLARE($callBackMethod : Text)
+var $Error : Text
 
 If (Count parameters:C259>=1)
-	<>OnErrorMethod:=$1
+	<>OnErrorMethod:=$callBackMethod
 Else 
 	$Error:=Get localized string:C991("IncorrectNumberOfParameters")
 End if 
diff --git a/Project/Sources/Methods/Progress SET ON STOP METHOD.4dm b/Project/Sources/Methods/Progress SET ON STOP METHOD.4dm
index 3680913..a286dcf 100644
--- a/Project/Sources/Methods/Progress SET ON STOP METHOD.4dm	
+++ b/Project/Sources/Methods/Progress SET ON STOP METHOD.4dm	
@@ -1,30 +1,16 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($2)  //callback method name
-C_BOOLEAN:C305($3)  //If passed then the progress window becomes the frontmost window
+#DECLARE($ProgressID : Integer; $OnStopMethodName : Text; $FrontMost : Boolean)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer
+var $p : Integer
 
-C_LONGINT:C283($p; $CountParam)
-
-C_TEXT:C284($OnStopMethodName)
-C_BOOLEAN:C305($FrontMost)
-
-$CountParam:=Count parameters:C259
-If ($CountParam>=2)
-	
-	$ProgressID:=$1
-	$OnStopMethodName:=$2
-	If ($CountParam>=3)
-		$FrontMost:=$3
-	End if 
+If (Count parameters:C259>=2)
 	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
 	If ($p>0)
-		<>_ProgressOnStop{$p}:=$2
+		<>_ProgressOnStop{$p}:=$OnStopMethodName
 		<>_ProgressUpdated{$p}:=True:C214
 	Else 
 		$ErrorID:=1  //bad ID
diff --git a/Project/Sources/Methods/Progress SET PROGRESS.4dm b/Project/Sources/Methods/Progress SET PROGRESS.4dm
index 040e45e..c392dc8 100644
--- a/Project/Sources/Methods/Progress SET PROGRESS.4dm	
+++ b/Project/Sources/Methods/Progress SET PROGRESS.4dm	
@@ -1,33 +1,13 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
+#DECLARE($ProgressID : Integer; $Progress : Real; $Message : Text; $FrontMost : Boolean)
 
-C_REAL:C285($2)
-C_TEXT:C284($3)
-C_BOOLEAN:C305($4)  //If passed then the progress window becomes the frontmost window
-
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
-
-C_LONGINT:C283($p; $CountParam)
-
-C_TEXT:C284($Title)
-C_REAL:C285($Progress)
-C_TEXT:C284($Message)
-C_PICTURE:C286($Icon)
-C_BOOLEAN:C305($FrontMost)
+var $ErrorID : Integer
+var $p : Integer
+var $CountParam : Integer
 
 $CountParam:=Count parameters:C259
 If ($CountParam>=2)
 	
-	$ProgressID:=$1
-	$Progress:=$2
-	If (Count parameters:C259>=3)
-		$Message:=$3
-		If (Count parameters:C259>=4)
-			$FrontMost:=$4
-		End if 
-	End if 
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
diff --git a/Project/Sources/Methods/Progress SET TITLE.4dm b/Project/Sources/Methods/Progress SET TITLE.4dm
index da7f8d1..6f4c7b2 100644
--- a/Project/Sources/Methods/Progress SET TITLE.4dm	
+++ b/Project/Sources/Methods/Progress SET TITLE.4dm	
@@ -1,37 +1,12 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress
-C_TEXT:C284($2)  //Almost mandatory (title)
-C_REAL:C285($3)  //optionnel (progress value)
-C_TEXT:C284($4)  //optionnel (message)
-C_BOOLEAN:C305($5)  //If passed then the progress window becomes the frontmost window
+#DECLARE($ProgressID : Integer; $Title : Text; $Progress : Real; $Message : Text; $FrontMost : Boolean)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
-
-C_LONGINT:C283($p; $CountParam)
-
-C_TEXT:C284($Title)
-C_REAL:C285($Progress)
-C_TEXT:C284($Message)
-C_PICTURE:C286($Icon)
-C_BOOLEAN:C305($FrontMost)
+var $ErrorID; $p : Integer
+var $CountParam : Integer
 
 $CountParam:=Count parameters:C259
 If ($CountParam>=2)
 	
-	$ProgressID:=$1
-	$Title:=$2
-	
-	If ($CountParam>=3)
-		$Progress:=$3
-		If ($CountParam>=4)
-			$Message:=$4
-			If ($CountParam>=5)
-				$FrontMost:=$5
-			End if 
-		End if 
-	End if 
-	
 	Progress__Semaphore_ON  //*************
 	
 	$p:=Find in array:C230(<>_ProgressID; $ProgressID)
diff --git a/Project/Sources/Methods/Progress SET WINDOW VISIBLE.4dm b/Project/Sources/Methods/Progress SET WINDOW VISIBLE.4dm
index deaa5df..2bc32c9 100644
--- a/Project/Sources/Methods/Progress SET WINDOW VISIBLE.4dm	
+++ b/Project/Sources/Methods/Progress SET WINDOW VISIBLE.4dm	
@@ -1,16 +1,14 @@
 //%attributes = {"invisible":true,"shared":true}
+#DECLARE($Show : Boolean/*Hide (false) or Show (true)*/; $WinPosX : Integer; $WinPosY : Integer; $FrontMost : Boolean)
 
-C_BOOLEAN:C305($1)  // Hide (false) or Show (true)
-C_LONGINT:C283($2; $3)  //Optional XY position of window (-1;-1;true) will NOT move the window
-C_BOOLEAN:C305($4)  //bring to front
+//Optional XY position of window (-1;-1;true) will NOT move the window
 
-C_LONGINT:C283($WinPosX; $WinPosY)
-C_LONGINT:C283($x1; $y1; $x2; $y2)
-C_BOOLEAN:C305($FrontMost; $ChangePosition; $Show)
-C_TEXT:C284($Error)
+var $x1; $y1; $x2; $y2 : Integer
+var $ChangePosition : Boolean
+var $Error : Text
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer
+var $ProgressID : Integer  // progress code ????
 
 $Show:=True:C214
 $WinPosX:=-1
@@ -18,20 +16,9 @@ $WinPosY:=-1
 $ChangePosition:=False:C215
 $FrontMost:=False:C215
 
-If (Count parameters:C259>=1)
-	$Show:=$1
-	If (Count parameters:C259>=2)
-		If (Count parameters:C259>2)
-			$WinPosX:=$2
-			$WinPosY:=$3
-			If (Count parameters:C259>=4)
-				$FrontMost:=$4
-			End if 
-		Else 
-			//only  X without Y !
-			$ErrorID:=2  // wrong number or parameters
-		End if 
-	End if 
+If (Count parameters:C259=2)
+	//only  X without Y !
+	$ErrorID:=2  // wrong number or parameters
 End if 
 
 If ($ErrorID=0)
diff --git a/Project/Sources/Methods/Progress Stopped.4dm b/Project/Sources/Methods/Progress Stopped.4dm
index df861f9..5f6a54e 100644
--- a/Project/Sources/Methods/Progress Stopped.4dm	
+++ b/Project/Sources/Methods/Progress Stopped.4dm	
@@ -1,19 +1,16 @@
 //%attributes = {"invisible":true,"shared":true}
-C_LONGINT:C283($1)  //Reference of Progress to stop
-C_BOOLEAN:C305($0)
+#DECLARE($ProgressID : Integer) : Boolean
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorID : Integer  //Error code
 
-C_LONGINT:C283($i; $p; $n)
-C_TEXT:C284($Error)
-C_BOOLEAN:C305($Canceled)
+var $p : Integer
+var $Error : Text
+var $Canceled : Boolean
 
 $Error:=""
 
 If (Count parameters:C259>=1)
 	
-	$ProgressID:=$1
 	
 	Progress__Semaphore_ON  //*************
 	
@@ -32,4 +29,4 @@ End if
 
 Progress__ManageMethodsError($ErrorID; $ProgressID)
 
-$0:=$Canceled
\ No newline at end of file
+return $Canceled
\ No newline at end of file
diff --git a/Project/Sources/Methods/Progress__CallCallBack.4dm b/Project/Sources/Methods/Progress__CallCallBack.4dm
index ce47797..961700c 100644
--- a/Project/Sources/Methods/Progress__CallCallBack.4dm
+++ b/Project/Sources/Methods/Progress__CallCallBack.4dm
@@ -1,14 +1,7 @@
 //%attributes = {"invisible":true}
-C_TEXT:C284($1)
-C_LONGINT:C283($2)
+#DECLARE($CallbackMethod : Text; $ProgressID : Integer)
 
-C_TEXT:C284($CallbackMethod)
-C_LONGINT:C283($ProgressID)
-
-C_TEXT:C284($Alert)
-
-$CallbackMethod:=$1
-$ProgressID:=$2
+var $Alert : Text
 
 <>ProgressError:=0
 ON ERR CALL:C155("Progress__TrapError")
diff --git a/Project/Sources/Methods/Progress__Compiler.4dm b/Project/Sources/Methods/Progress__Compiler.4dm
index f67f2b4..d8e893c 100644
--- a/Project/Sources/Methods/Progress__Compiler.4dm
+++ b/Project/Sources/Methods/Progress__Compiler.4dm
@@ -25,5 +25,5 @@ If (Not:C34(<>ProgressInited))
 	
 End if 
 
-C_LONGINT:C283(<>ErrorRange)
+var <>ErrorRange : Integer
 <>ErrorRange:=6510
diff --git a/Project/Sources/Methods/Progress__ManageMethodsError.4dm b/Project/Sources/Methods/Progress__ManageMethodsError.4dm
index 75104d4..ca1b209 100644
--- a/Project/Sources/Methods/Progress__ManageMethodsError.4dm
+++ b/Project/Sources/Methods/Progress__ManageMethodsError.4dm
@@ -1,14 +1,8 @@
 //%attributes = {"invisible":true}
-C_LONGINT:C283($1)  //Error code
-C_LONGINT:C283($2)  // Progress ID
+#DECLARE($ErrorID : Integer; $ProgressID : Integer)
 
-C_LONGINT:C283($ErrorID)  //Error code
-C_LONGINT:C283($ProgressID)  // progress code
+var $ErrorText : Text  // error text
 
-C_TEXT:C284($ErrorText)  // error text
-
-$ErrorID:=$1
-$ProgressID:=$2
 
 If ($ErrorID#0)
 	
diff --git a/Project/Sources/Methods/Progress__ManageOnStop.4dm b/Project/Sources/Methods/Progress__ManageOnStop.4dm
index 15f5451..6c4b7df 100644
--- a/Project/Sources/Methods/Progress__ManageOnStop.4dm
+++ b/Project/Sources/Methods/Progress__ManageOnStop.4dm
@@ -3,12 +3,11 @@
 //the name of the callback method is set inside the form objet "CallBack" inside
 //the subform from where this method is called; So it can be acessed and used.
 
-C_POINTER:C301($PtrCallback; $PtrProgressID)
-C_TEXT:C284($CallbackMethod)
-C_LONGINT:C283($ProgressID)
-C_LONGINT:C283($ps)
-C_LONGINT:C283($p)
-
+var $PtrCallback; $PtrProgressID : Pointer
+var $CallbackMethod : Text
+var $ProgressID : Integer
+var $ps : Integer
+var $p : Integer
 
 $PtrCallback:=OBJECT Get pointer:C1124(Object named:K67:5; "CallBack")
 If (Not:C34(Is nil pointer:C315($PtrCallback)))  // this should neve happend
diff --git a/Project/Sources/Methods/Progress__OnExternalCall.4dm b/Project/Sources/Methods/Progress__OnExternalCall.4dm
index 7061ba2..4153194 100644
--- a/Project/Sources/Methods/Progress__OnExternalCall.4dm
+++ b/Project/Sources/Methods/Progress__OnExternalCall.4dm
@@ -1,24 +1,18 @@
 //%attributes = {"invisible":true}
+#DECLARE($SubformWidth : Integer; $SubformHeight : Integer)
 
-C_LONGINT:C283($1; $2)
+var $x1; $y1; $x2; $y2 : Integer
+var $FormHeight : Integer
 
-C_LONGINT:C283($x1; $y1; $x2; $y2)
-C_LONGINT:C283($SubformWidth; $SubformHeight)
-C_LONGINT:C283($FormHeight)
+var $i; $n; $p : Integer
+var $ID : Integer
+var $Target : Integer
 
-C_LONGINT:C283($i; $n; $p)
-C_LONGINT:C283($ID)
-C_LONGINT:C283($Target)
+var $NilPtr : Pointer
+var $Ptr : Pointer
 
-C_POINTER:C301($NilPtr)
-C_POINTER:C301($Ptr)
-
-C_TEXT:C284($SubFormName)
-C_LONGINT:C283($VerticalCenter)
-
-
-$SubformWidth:=$1
-$SubformHeight:=$2
+var $SubFormName : Text
+var $VerticalCenter : Integer
 
 Progress__Semaphore_ON  //***************************************
 
diff --git a/Project/Sources/Methods/Progress__UpdateDynVar.4dm b/Project/Sources/Methods/Progress__UpdateDynVar.4dm
index 550656e..b01ba51 100644
--- a/Project/Sources/Methods/Progress__UpdateDynVar.4dm
+++ b/Project/Sources/Methods/Progress__UpdateDynVar.4dm
@@ -1,29 +1,25 @@
 //%attributes = {"invisible":true}
+#DECLARE($ProgressID : Integer)
 
-C_LONGINT:C283($1)
-C_LONGINT:C283($ProgressID)
+var $x1; $y1; $x2; $y2 : Integer
+var $MemoX : Integer
+var $p; $n : Integer
+var $BestWidth; $BestHeight : Integer
 
-C_LONGINT:C283($x1; $y1; $x2; $y2)
-C_LONGINT:C283($MemoX)
-C_LONGINT:C283($p; $n)
-C_LONGINT:C283($BestWidth; $BestHeight)
+var $Sep; $Path; $Limit : Text
 
-C_TEXT:C284($Sep; $Path; $Limit)
+var $ptr : Pointer
+var $ptrProgress : Pointer
+var $ptrThermo : Pointer
 
-C_POINTER:C301($ptr)
-C_POINTER:C301($ptrProgress)
-C_POINTER:C301($ptrThermo)
+var $CurrentProgress; $NewProgress : Real
 
-C_REAL:C285($CurrentProgress; $NewProgress)
+var $PtrCancelAllow : Pointer
+var $ptrCallback : Pointer
 
-C_POINTER:C301($PtrCancelAllow)
-C_POINTER:C301($ptrCallback)
-
-C_LONGINT:C283($CurrentCancelAllow; $NewCancelAllow)
-C_TEXT:C284($CurrentCallback; $NewCallback)
-C_TEXT:C284($CurrentCancelText; $NewCancelText)
-
-$ProgressID:=$1
+var $CurrentCancelAllow; $NewCancelAllow : Integer
+var $CurrentCallback; $NewCallback : Text
+var $CurrentCancelText; $NewCancelText : Text
 
 $n:=Size of array:C274(<>_ProgressID)  // number of progress bars
 $p:=Find in array:C230(<>_ProgressID; $ProgressID)  // position of the concern progress bar