diff --git a/changelog.txt b/changelog.txt
index 3234e2fa..e2ee0715 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+15-nov-2008 - adelikat - Win32 - memwatch - implemented RamChange() - monitors the behavior of ram addresses
 15-nov-2008 - adelikat - Win32 - re-enabled sound buffer time
 15-nov-2008 - adelikat - Clip Left and Right sides taken into account when drawing on screen (record/play/pause, lag & frame counters, messages, etc)
 15-nov-2008 - adelikat - win32 - Implemented Drap & Drop for movie files
diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp
index 7b104464..49168267 100644
--- a/src/drivers/win/memwatch.cpp
+++ b/src/drivers/win/memwatch.cpp
@@ -742,6 +742,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 		{
 		case MEMW_FILE_CLOSE:  
 			CloseMemoryWatch();
+			RamChangeInitialize = false;
 			break;
 
 		case ACCEL_CTRL_O:
@@ -762,6 +763,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 		case ACCEL_CTRL_N:
 		case MEMW_FILE_NEW:
 			ClearAllText();
+			RamChange();
 			break;
 		
 		case MEMW_FILE_RECENT:
@@ -931,7 +933,20 @@ void RamChange()
 		MWRec& mwrec = mwrecs[x];
 		if(mwrec.valid && GameInfo)
 		{
-			GetDlgItemText(hwndMemWatch, MW_ADDR00+(x*3), editboxnow[x], 6);	//Get Address value of edit00
+			int whichADDR = 0;
+			//Get proper Addr edit box
+			switch (x)
+			{
+			case 0:
+				whichADDR = 0; break;	//Addr 1
+			case 1:
+				whichADDR = 3; break;	//Addr 2
+			case 2:
+				whichADDR = 36; break;	//Addr 12
+			case 3:
+				whichADDR = 39; break;	//Addr 13
+			}
+			GetDlgItemText(hwndMemWatch, MW_ADDR00+(whichADDR), editboxnow[x], 6);	//Get Address value of edit00
 			SetDlgItemText(hwndMemWatch, MEMW_EDIT00RMADDRESS+x, editboxnow[x]); //Put Address value
 			editlast[x] = editnow[x];											//Update last value
 			editnow[x] = GetMem(mwrec.addr);									//Update now value
@@ -974,5 +989,9 @@ void RamChange()
 			sprintf(editchangem[x], "%d", editcount[x]);	//Convert counter to text
 			SetDlgItemText(hwndMemWatch, EDIT00_RESULTS+x, editchangem[x]);	//Display text in results box
 		}
+		else
+		{
+			SetDlgItemText(hwndMemWatch, MEMW_EDIT00RMADDRESS+x, "");
+		}
 	} //End of for loop	
 }
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index b05f1427..be2d3538 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -778,7 +778,7 @@ BEGIN
     LTEXT           "Type a key, or press Escape to disable.",65429,53,14,125,8
 END
 
-MEMWATCH DIALOGEX 0, 0, 260, 269
+MEMWATCH DIALOGEX 0, 0, 260, 263
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Memory Watch"
 MENU MEMWATCHMENU
@@ -841,30 +841,31 @@ BEGIN
     LTEXT           "Address",65424,135,7,26,8
     LTEXT           "Value",MW_ValueLabel2,231,7,19,8
     LTEXT           " ",EDIT00_RESULTS,89,225,26,8
-    GROUPBOX        "Memory Change Monitoring",IDC_STATIC,0,202,129,65
+    GROUPBOX        "Memory Change Monitoring",IDC_STATIC,0,202,129,57,BS_CENTER
     LTEXT           "Address",IDC_STATIC,6,213,26,8
     LTEXT           "Count",IDC_STATIC,90,213,20,8
-    LTEXT           "Change formula",IDC_STATIC,36,213,50,8
+    LTEXT           "Formula",IDC_STATIC,47,213,26,8
     LTEXT           " ",MEMW_EDIT00RMADDRESS,7,225,24,8
-    PUSHBUTTON      " ",MEMW_EDIT00RESET,115,226,11,7
+    PUSHBUTTON      " ",MEMW_EDIT00RESET,115,225,11,7
     LTEXT           "reset",IDC_STATIC,112,213,16,8
     COMBOBOX        MEMW_EDIT00FORMULA,37,223,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     LTEXT           " ",MEMW_EDIT01RMADDRESS,7,241,24,8
     COMBOBOX        MEMW_EDIT01FORMULA,37,241,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           " ",EDIT01_RESULTS,89,244,25,8
-    PUSHBUTTON      " ",MEMW_EDIT01RESET,115,243,11,7
+    LTEXT           " ",EDIT01_RESULTS,89,241,25,8
+    PUSHBUTTON      " ",MEMW_EDIT01RESET,115,241,11,7
     LTEXT           " ",EDIT02_RESULTS,217,225,26,8
     LTEXT           "Address",IDC_STATIC,133,213,26,8
-    LTEXT           "Change formula",IDC_STATIC,163,213,50,8
+    LTEXT           "Formula",IDC_STATIC,173,213,26,8
     LTEXT           " ",MEMW_EDIT02RMADDRESS,135,225,24,8
-    PUSHBUTTON      " ",MEMW_EDIT02RESET,243,226,11,7
+    PUSHBUTTON      " ",MEMW_EDIT02RESET,242,225,11,7
     LTEXT           "reset",IDC_STATIC,239,213,16,8
     COMBOBOX        MEMW_EDIT02FORMULA,165,223,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           " ",MEMW_EDIT03RMADDRESS,135,242,24,8
+    LTEXT           " ",MEMW_EDIT03RMADDRESS,135,241,24,8
     COMBOBOX        MEMW_EDIT03FORMULA,165,241,48,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           " ",EDIT03_RESULTS,217,244,28,8
-    PUSHBUTTON      " ",MEMW_EDIT03RESET,243,243,11,7
-    GROUPBOX        "Memory Change Monitoring",IDC_STATIC,131,202,125,65
+    LTEXT           " ",EDIT03_RESULTS,217,241,28,8
+    PUSHBUTTON      " ",MEMW_EDIT03RESET,242,241,11,7
+    GROUPBOX        "Memory Change Monitoring",IDC_STATIC,131,202,125,57,BS_CENTER
+    LTEXT           "Count",IDC_STATIC,217,213,20,8
 END
 
 DEBUGGER DIALOGEX 54, 74, 548, 305
@@ -1430,7 +1431,7 @@ BEGIN
 
     "MEMWATCH", DIALOG
     BEGIN
-        BOTTOMMARGIN, 267
+        BOTTOMMARGIN, 262
     END
 
     "DEBUGGER", DIALOG