diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile
--- a/FSW-qt/Makefile
+++ b/FSW-qt/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bin/fsw
-# Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Nov 13 08:18:19 2013
+# Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Nov 13 13:54:37 2013
 # Project:  fsw-qt.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user
--- a/FSW-qt/fsw-qt.pro.user
+++ b/FSW-qt/fsw-qt.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.8.1, 2013-11-13T13:39:43. -->
+<!-- Written by QtCreator 2.8.1, 2013-11-13T13:50:25. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/header/grlib_regs.h b/header/grlib_regs.h
--- a/header/grlib_regs.h
+++ b/header/grlib_regs.h
@@ -46,21 +46,22 @@ struct time_management_regs_str{
 typedef struct time_management_regs_str time_management_regs_t;
 
 struct new_waveform_picker_regs_str{
-    volatile int data_shaping;      // 0x00 00      *** R1 R0 SP1 SP0 BW
-    volatile int run_burst_enable;  // 0x04 01      *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
-    volatile int addr_data_f0;      // 0x08
-    volatile int addr_data_f1;      // 0x0c
-    volatile int addr_data_f2;      // 0x10
-    volatile int addr_data_f3;      // 0x14
-    volatile int status;            // 0x18
-    volatile int delta_snapshot;    // 0x1c
-    volatile int delta_f0;          // 0x20
-    volatile int delta_f0_2;
-    volatile int delta_f1;
-    volatile int delta_f2;
-    volatile int nb_data_by_buffer;
-    volatile int snapshot_param;
-    volatile int start_date;
+    int data_shaping;       // 0x00 00      *** R1 R0 SP1 SP0 BW
+    int run_burst_enable;   // 0x04 01      *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
+    int addr_data_f0;       // 0x08
+    int addr_data_f1;       // 0x0c
+    int addr_data_f2;       // 0x10
+    int addr_data_f3;       // 0x14
+    volatile int status;    // 0x18
+    int delta_snapshot;     // 0x1c
+    int delta_f0;           // 0x20
+    int delta_f0_2;         // 0x24
+    int delta_f1;           // 0x28
+    int delta_f2;           // 0x2c
+    int nb_data_by_buffer;  // 0x30
+    int snapshot_param;     // 0x34
+    int start_date;         // 0x38
+    int nb_word_in_buffer;  // 0x3c
 };
 typedef struct new_waveform_picker_regs_str new_waveform_picker_regs_t;
 
diff --git a/src/wf_handler.c b/src/wf_handler.c
--- a/src/wf_handler.c
+++ b/src/wf_handler.c
@@ -1078,6 +1078,7 @@ void reset_new_waveform_picker_regs()
    * - 0x30 nb_data_by_buffer
    * - 0x34 nb_snapshot_param
    * - 0x38 start_date
+   * - 0x3c nb_word_in_buffer
    *
    */
 
@@ -1095,9 +1096,10 @@ void reset_new_waveform_picker_regs()
     new_waveform_picker_regs->delta_f1 = 0x3c0;             // 0x28 *** 960
 //    new_waveform_picker_regs->delta_f2 = 0x12200;         // 0x2c *** 74240
     new_waveform_picker_regs->delta_f2 = 0xc00;             // 0x2c *** 12 * 256 = 2048
-    new_waveform_picker_regs->nb_data_by_buffer = 0x1802;   // 0x30 *** 2048 * 3 + 2
-    new_waveform_picker_regs->snapshot_param = 0x7ff;       // 0x34 *** 2048 -1
+    new_waveform_picker_regs->nb_data_by_buffer = 0x7ff;    // 0x30 *** 2048 -1
+    new_waveform_picker_regs->snapshot_param = 0x800;       // 0x34 *** 2048
     new_waveform_picker_regs->start_date = 0x00;            // 0x38
+    new_waveform_picker_regs->nb_word_in_buffer = 0x1802;   // 0x3c *** 2048 * 3 + 2 = 6146
 }
 
 //*****************