diff --git a/slsDetectorSoftware/gotthardDetectorServer/Makefile b/slsDetectorSoftware/gotthardDetectorServer/Makefile
index 1cd94ee59..29ef47aea 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/Makefile
+++ b/slsDetectorSoftware/gotthardDetectorServer/Makefile
@@ -6,7 +6,7 @@
 CROSS  = bfin-uclinux-
 CC    = $(CROSS)gcc
 
-CFLAGS += -Wall  -DMCB_FUNCS  -DVERBOSE #-DVERY_VERBOSE #-DVIRTUAL
+CFLAGS += -Wall  -DMCB_FUNCS -DVERBOSE #-DVERY_VERBOSE #-DVIRTUAL
 
 #INCLUDES= /usr/src/kernels/2.6.18-238.12.1.el5-i686/include
 #/home/l_maliakal_d/bfin/blackfin-linux-dist/linux-2.6.x/include
diff --git a/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.c
index 8c28ea1a2..863a31789 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/communication_funcs.c
@@ -96,8 +96,7 @@ int acceptConnection(int socketDescriptor) {
   
   //  if(file_des>0) return file_des;
 
-  //next 3 lines commented out by dhanya
-  //#ifndef C_ONLY
+ //#ifndef C_ONLY
   //  if(is_a_server){ //server; the server will wait for the clients connection
   //#endif
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 84f5e67f8..997057f79 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -15,6 +15,9 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/stat.h>
+#include </opt/uClinux/bfin-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/bfin_sram.h>
+
+
 
 
 //for memory mapping
@@ -171,8 +174,8 @@ int mapCSP0(void) {
   
   u_int32_t address;
   address = FIFO_DATA_REG_OFF;
-  values=(u_int16_t*)(CSP0BASE+address*2);
-  printf("values=%04x\n",values);
+  values=(u_int32_t*)(CSP0BASE+address*2);
+  printf("values=%08x\n",values);
   //printf("values=%08x\n",((u_int32_t*)(CSP0BASE+FIFO_DATA_REG_OFF*2)));
 
   /* must b uncommentedlater////////////////////////////////////////////////////////
@@ -1263,7 +1266,7 @@ u_int32_t runState(void) {
     write_status_sm("Stopped");  
 #endif
 #ifdef VERBOSE
-  printf("status %08x\n",s);
+  printf("status %04x\n",s);
 #endif
   return s;
 }
@@ -1272,9 +1275,9 @@ u_int32_t runState(void) {
 // State Machine 
 
 u_int32_t  startStateMachine(){
-#ifdef VERBOSE
+//#ifdef VERBOSE
   printf("Starting State Machine\n");
-#endif
+//#endif
   // fifoReset();   printf("Starting State Machine\n");
   now_ptr=(char*)ram_values;
 #ifdef SHAREDMEMORY
@@ -1442,7 +1445,35 @@ u_int32_t* fifo_read_event()
       printf("FIFO %d contains %d words\n",ichip,(fifoReadCounter(ichip)&FIFO_COUNTER_MASK)); 
   }
 #endif
-  memcpy(now_ptr, values, dataBytes);
+
+
+  //unsigned long flags;
+
+ // register int ihalf;
+
+ // save_flags(flags);
+ // cli(); /* This code runs with interrupts disabled */
+
+
+/*  for (ihalf=0;ihalf<dataBytes/sizeof(int); ihalf++){
+	  ram_values[ihalf]=*values;
+  }*/
+
+
+ // restore_flags(flags);
+
+/*
+  for (ihalf=0;ihalf<dataBytes/sizeof(int); ihalf++)
+  	  printf("\n%d: 0x%0x 0x%0x",ihalf,ram_values[ihalf]&0xffff,(ram_values[ihalf]>>16)&0xffff);
+*/
+
+/* for (ichip=0;ichip<dataBytes/2; ichip++)
+	  printf("\n%d: %08x",ichip,*values);*/
+
+
+      //sram_free(now_ptr);
+      memcpy(now_ptr, values, dataBytes);
+
   /*
 #ifdef VERBOSE
   for (ichip=0;ichip<dataBytes/4; ichip++) {
diff --git a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
index 8aec9f51b..bcd26202b 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h
@@ -52,45 +52,45 @@
 
 //FIFO
 #define LOOK_AT_ME_REG   	  0x28<<11
-#define COUNTER_REG_OFF       0x29<<11
+
 #define FIFO_DATA_REG_OFF     0x80<<11 ///////
 
 
 //to read back dac registers
-#define MOD_DACS1_REG         0x2a<<11
-#define MOD_DACS2_REG         0x2b<<11
-#define MOD_DACS3_REG         0x2c<<11
+#define MOD_DACS1_REG         0x65<<11
+#define MOD_DACS2_REG         0x66<<11
+#define MOD_DACS3_REG         0x67<<11
 
 //user entered
-#define SET_DELAY_LSB_REG     0x2d<<11
-#define SET_DELAY_MSB_REG     0x2e<<11
-#define GET_DELAY_LSB_REG     0x2f<<11
-#define GET_DELAY_MSB_REG     0x30<<11
+#define SET_DELAY_LSB_REG     0x68<<11
+#define SET_DELAY_MSB_REG     0x69<<11
+#define GET_DELAY_LSB_REG     0x6a<<11
+#define GET_DELAY_MSB_REG     0x6b<<11
 
-#define SET_TRAINS_LSB_REG    0x31<<11
-#define SET_TRAINS_MSB_REG    0x32<<11
-#define GET_TRAINS_LSB_REG    0x33<<11
-#define GET_TRAINS_MSB_REG    0x34<<11
+#define SET_TRAINS_LSB_REG    0x6c<<11
+#define SET_TRAINS_MSB_REG    0x6d<<11
+#define GET_TRAINS_LSB_REG    0x6e<<11
+#define GET_TRAINS_MSB_REG    0x6f<<11
 
-#define SET_FRAMES_LSB_REG    0x35<<11
-#define SET_FRAMES_MSB_REG    0x36<<11
-#define GET_FRAMES_LSB_REG    0x37<<11
-#define GET_FRAMES_MSB_REG    0x38<<11
+#define SET_FRAMES_LSB_REG    0x70<<11
+#define SET_FRAMES_MSB_REG    0x71<<11
+#define GET_FRAMES_LSB_REG    0x72<<11
+#define GET_FRAMES_MSB_REG    0x73<<11
 
-#define SET_PERIOD_LSB_REG    0x39<<11
-#define SET_PERIOD_MSB_REG    0x3a<<11
-#define GET_PERIOD_LSB_REG    0x3b<<11
-#define GET_PERIOD_MSB_REG    0x3c<<11
+#define SET_PERIOD_LSB_REG    0x74<<11
+#define SET_PERIOD_MSB_REG    0x75<<11
+#define GET_PERIOD_LSB_REG    0x76<<11
+#define GET_PERIOD_MSB_REG    0x77<<11
 
-#define SET_EXPTIME_LSB_REG   0x3d<<11
-#define SET_EXPTIME_MSB_REG   0x3e<<11
-#define GET_EXPTIME_LSB_REG   0x3f<<11
-#define GET_EXPTIME_MSB_REG   0x40<<11
+#define SET_EXPTIME_LSB_REG   0x78<<11
+#define SET_EXPTIME_MSB_REG   0x79<<11
+#define GET_EXPTIME_LSB_REG   0x7a<<11
+#define GET_EXPTIME_MSB_REG   0x7b<<11
 
-#define SET_GATES_LSB_REG     0x41<<11
-#define SET_GATES_MSB_REG     0x42<<11
-#define GET_GATES_LSB_REG     0x43<<11
-#define GET_GATES_MSB_REG     0x44<<11
+#define SET_GATES_LSB_REG     0x7c<<11
+#define SET_GATES_MSB_REG     0x7d<<11
+#define GET_GATES_LSB_REG     0x7e<<11
+#define GET_GATES_MSB_REG     0x7f<<11
 
 
 
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index b9bc16ce9..a0ae16d36 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -94,7 +94,7 @@ int decode_function(int file_des) {
 #endif 
   n = receiveDataOnly(file_des,&fnum,sizeof(fnum));
   if (n <= 0) {
-    printf("ERROR reading from socket %d, %d %d\n", n, fnum, file_des);
+    //printf("ERROR reading from socket %d, %d %d\n", n, fnum, file_des);
     return FAIL;
   }
 #ifdef VERBOSE
@@ -1853,6 +1853,16 @@ int get_run_status(int file_des) {
 
   retval= runState();
   printf("\n\nSTATUS=%x\n",retval);
+
+  if (retval&0x00000001){
+	  printf("-----------------------------------RUNNING-----------------------------------\n");
+	  s=RUNNING;
+  }
+  else{
+	  printf("-----------------------------------IDLE----------------------------------\n");
+	  s=IDLE;
+  }
+  /*
   if (retval&0x8000)
     s=ERROR;
   else if (retval&0x00000001)
@@ -1867,7 +1877,7 @@ int get_run_status(int file_des) {
     s=WAITING;
   else
     s=IDLE;
-
+*/
 
 
   if (ret!=OK) {
@@ -1995,6 +2005,7 @@ int read_all(int file_des) {
 
  
   while(read_frame(file_des)==OK) {
+	  //usleep(0);
 #ifdef VERBOSE
   printf("frame read\n");
 #endif