diff --git a/apps/flowgraphs/satellites/noaa_apt_decoder.grc b/apps/flowgraphs/satellites/noaa_apt_decoder.grc
index 0831399..0dded8c 100644
--- a/apps/flowgraphs/satellites/noaa_apt_decoder.grc
+++ b/apps/flowgraphs/satellites/noaa_apt_decoder.grc
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<?grc format='1' created='3.7.12'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Mon Apr 10 23:26:02 2017</timestamp>
   <block>
@@ -72,10 +72,6 @@
       <key>run</key>
       <value>True</value>
     </param>
-    <param>
-      <key>sizing_mode</key>
-      <value>fixed</value>
-    </param>
     <param>
       <key>thread_safe_setters</key>
       <value></value>
@@ -84,10 +80,6 @@
       <key>title</key>
       <value>NOAA APT Decoder</value>
     </param>
-    <param>
-      <key>placement</key>
-      <value>(0,0)</value>
-    </param>
   </block>
   <block>
     <key>variable</key>
@@ -378,10 +370,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -504,10 +492,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>eng_float</value>
@@ -594,10 +578,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -641,10 +621,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -688,10 +664,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -735,10 +707,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -841,10 +809,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -943,10 +907,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -1100,10 +1060,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>eng_float</value>
@@ -1147,10 +1103,6 @@ TX sampling rate</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -1195,10 +1147,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>eng_float</value>
@@ -2649,10 +2597,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -2867,7 +2811,7 @@ we shift the LO a little further</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(896, 232)</value>
+      <value>(936, 232)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2932,10 +2876,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>eng_float</value>
@@ -2979,10 +2919,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -3026,10 +2962,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>eng_float</value>
@@ -3073,10 +3005,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -3161,7 +3089,7 @@ we shift the LO a little further</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1112, 236)</value>
+      <value>(1176, 236)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -3226,6 +3154,10 @@ we shift the LO a little further</value>
       <key>width</key>
       <value>2080</value>
     </param>
+    <param>
+      <key>split</key>
+      <value>False</value>
+    </param>
     <param>
       <key>sync</key>
       <value>bool(sync)</value>
@@ -3365,7 +3297,7 @@ we shift the LO a little further</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(917, 0)</value>
+      <value>(712, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -3385,7 +3317,7 @@ we shift the LO a little further</value>
     </param>
     <param>
       <key>samp_rate</key>
-      <value>samp_rate_rx/ ( first_stage_decimation  * int(samp_rate_rx/ first_stage_decimation / initial_bandwidth))</value>
+      <value>samp_rate_rx /first_stage_decimation</value>
     </param>
   </block>
   <block>
@@ -3422,10 +3354,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>intx</value>
@@ -3469,10 +3397,6 @@ we shift the LO a little further</value>
       <key>short_id</key>
       <value></value>
     </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
     <param>
       <key>type</key>
       <value>string</value>
@@ -3518,12 +3442,6 @@ we shift the LO a little further</value>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>fft_filter_xxx_0</source_block_id>
-    <sink_block_id>satnogs_waterfall_sink_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>fir_filter_xxx_1</source_block_id>
     <sink_block_id>rational_resampler_xxx_0</sink_block_id>
@@ -3578,6 +3496,12 @@ we shift the LO a little further</value>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>satnogs_coarse_doppler_correction_cc_0</source_block_id>
+    <sink_block_id>satnogs_waterfall_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>satnogs_tcp_rigctl_msg_source_0</source_block_id>
     <sink_block_id>satnogs_coarse_doppler_correction_cc_0</sink_block_id>
diff --git a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
index e6a2a5c..d39eca0 100755
--- a/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
+++ b/apps/flowgraphs/satellites/satnogs_noaa_apt_decoder.py
@@ -5,7 +5,7 @@
 # Title: NOAA APT Decoder
 # Author: Manolis Surligas, George Vardakis
 # Description: A NOAA APT Decoder with automatic image synchronization
-# Generated: Fri Feb  2 16:19:42 2018
+# Generated: Thu Feb  8 14:09:41 2018
 ##################################################
 
 from gnuradio import analog
@@ -65,10 +65,10 @@ class satnogs_noaa_apt_decoder(gr.top_block):
         ##################################################
         # Blocks
         ##################################################
-        self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(samp_rate_rx/ ( first_stage_decimation  * int(samp_rate_rx/ first_stage_decimation / initial_bandwidth)), 0.0, 8, 1024, waterfall_file_path, 0)
+        self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(samp_rate_rx /first_stage_decimation, 0.0, 8, 1024, waterfall_file_path, 0)
         self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
         self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, 48000, 0.8)
-        self.satnogs_noaa_apt_sink_0 = satnogs.noaa_apt_sink(decoded_data_file_path, 2080, 1800, bool(sync), bool(flip_images))
+        self.satnogs_noaa_apt_sink_0 = satnogs.noaa_apt_sink(decoded_data_file_path, 2080, 1800, False, bool(sync), bool(flip_images))
         self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
         self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx /first_stage_decimation)
         self.rational_resampler_xxx_2 = filter.rational_resampler_ccc(
@@ -122,8 +122,6 @@ class satnogs_noaa_apt_decoder(gr.top_block):
         	audio_decimation=audio_decimation,
         )
 
-
-
         ##################################################
         # Connections
         ##################################################
@@ -134,7 +132,6 @@ class satnogs_noaa_apt_decoder(gr.top_block):
         self.connect((self.blocks_complex_to_mag_0, 0), (self.rational_resampler_xxx_0_0, 0))
         self.connect((self.fft_filter_xxx_0, 0), (self.analog_wfm_rcv_0, 0))
         self.connect((self.fft_filter_xxx_0, 0), (self.rational_resampler_xxx_2, 0))
-        self.connect((self.fft_filter_xxx_0, 0), (self.satnogs_waterfall_sink_0, 0))
         self.connect((self.fir_filter_xxx_1, 0), (self.rational_resampler_xxx_0, 0))
         self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0))
         self.connect((self.hilbert_fc_0, 0), (self.blocks_complex_to_mag_0, 0))
@@ -144,6 +141,7 @@ class satnogs_noaa_apt_decoder(gr.top_block):
         self.connect((self.rational_resampler_xxx_1, 0), (self.satnogs_ogg_encoder_0, 0))
         self.connect((self.rational_resampler_xxx_2, 0), (self.satnogs_iq_sink_0, 0))
         self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.fft_filter_xxx_0, 0))
+        self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.satnogs_waterfall_sink_0, 0))
 
     def get_antenna(self):
         return self.antenna