295 files changed, 9624 insertions, 3014 deletions

diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 203f39d0d..349ecd3d7 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2011 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -26,14 +26,11 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
 
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
-	gnuradio-examples/c++/Makefile \
-	gnuradio-examples/c++/audio/Makefile \
 	gnuradio-examples/python/Makefile \
 	gnuradio-examples/grc/Makefile \
 	gnuradio-examples/python/apps/hf_explorer/Makefile \
    	gnuradio-examples/python/apps/hf_radio/Makefile \
    	gnuradio-examples/python/apps/Makefile \
-   	gnuradio-examples/python/audio/Makefile \
    	gnuradio-examples/python/digital/Makefile \
    	gnuradio-examples/python/digital_voice/Makefile \
 	gnuradio-examples/python/digital-bert/Makefile \
@@ -43,6 +40,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
    	gnuradio-examples/python/network/Makefile \
    	gnuradio-examples/python/ofdm/Makefile \
    	gnuradio-examples/python/pfb/Makefile \
+   	gnuradio-examples/python/tags/Makefile \
    	gnuradio-examples/python/usrp/Makefile \
 	gnuradio-examples/python/usrp2/Makefile \
 	gnuradio-examples/waveforms/Makefile \
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
index bcb19be35..92a0440d0 100644
--- a/config/grc_gr_audio.m4
+++ b/config/grc_gr_audio.m4
@@ -101,6 +101,9 @@ AC_DEFUN([GRC_GR_AUDIO],[
 
     AC_CONFIG_FILES([ \
         gr-audio/Makefile \
+	gr-audio/examples/Makefile \
+	gr-audio/examples/c++/Makefile \
+	gr-audio/examples/python/Makefile \
         gr-audio/grc/Makefile \
         gr-audio/include/Makefile \
         gr-audio/lib/Makefile \
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 5e3089417..7e54b0f5a 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[
     dnl   no   : otherwise
     if test $passed = yes; then
         dnl Don't do gr-comedi if the 'comedi' library is unavailable.
-        PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[],
+        PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[],
             [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
     fi
 
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index bc9ca6f49..5d11acc22 100644
--- a/config/grc_gr_trellis.m4
+++ b/config/grc_gr_trellis.m4
@@ -27,6 +27,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[
         gr-trellis/Makefile \
 	gr-trellis/gnuradio-trellis.pc \
         gr-trellis/doc/Makefile \
+        gr-trellis/grc/Makefile \
         gr-trellis/src/Makefile \
         gr-trellis/src/lib/Makefile \
         gr-trellis/src/lib/run_guile_tests \
diff --git a/config/grc_gr_usrp2.m4 b/config/grc_gr_usrp2.m4
index 3d64db6d6..4ee29861b 100644
--- a/config/grc_gr_usrp2.m4
+++ b/config/grc_gr_usrp2.m4
@@ -26,6 +26,7 @@ AC_DEFUN([GRC_GR_USRP2],[
 
     AC_CONFIG_FILES([ \
         gr-usrp2/Makefile \
+	gr-usrp2/apps/Makefile \
         gr-usrp2/grc/Makefile \
 	gr-usrp2/gnuradio-usrp2.pc \
         gr-usrp2/src/Makefile \
diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
index da919b35c..8781065d4 100644
--- a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
+++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
@@ -71,7 +71,7 @@ public:
     d_prev_output = 0;
   }
 
-  o_type prev_output () { return d_prev_output; }
+  o_type prev_output () const { return d_prev_output; }
     
 protected:
   tap_type	d_alpha;
@@ -155,7 +155,7 @@ public:
     d_prev_output = 0;
   }
 
-  gr_complexd prev_output () { return d_prev_output; }
+  gr_complexd prev_output () const { return d_prev_output; }
     
 protected:
   double	d_alpha;
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 2a7a4b025..15272dd5c 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -181,7 +181,8 @@ libgeneral_la_SOURCES = 		\
 	gr_probe_density_b.cc		\
 	gr_annotator_alltoall.cc	\
 	gr_annotator_1to1.cc		\
-	gr_burst_tagger.cc
+	gr_burst_tagger.cc \
+	gr_correlate_access_code_tag_bb.cc
 
 libgeneral_qa_la_SOURCES = 		\
 	qa_general.cc			\
@@ -355,7 +356,8 @@ grinclude_HEADERS = 			\
 	gr_probe_density_b.h		\
 	gr_annotator_alltoall.h		\
 	gr_annotator_1to1.h		\
-	gr_burst_tagger.h
+	gr_burst_tagger.h	\
+	gr_correlate_access_code_tag_bb.h
 
 noinst_HEADERS = 			\
 	qa_general.h			\
@@ -499,4 +501,5 @@ swiginclude_HEADERS =			\
 	gr_probe_density_b.i		\
 	gr_annotator_alltoall.i		\
 	gr_annotator_1to1.i		\
-	gr_burst_tagger.i
+	gr_burst_tagger.i	\
+	gr_correlate_access_code_tag_bb.i
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index e8a18ab19..fd158cd1f 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -146,6 +146,7 @@
 #include <gr_annotator_alltoall.h>
 #include <gr_annotator_1to1.h>
 #include <gr_burst_tagger.h>
+#include <gr_correlate_access_code_tag_bb.h>
 %}
 
 %include "gr_nop.i"
@@ -272,3 +273,4 @@
 %include "gr_annotator_alltoall.i"
 %include "gr_annotator_1to1.i"
 %include "gr_burst_tagger.i"
+%include "gr_correlate_access_code_tag_bb.i"
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.cc b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.cc
new file mode 100644
index 000000000..23311f7a4
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.cc
@@ -0,0 +1,129 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2006,2010,2011 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_correlate_access_code_tag_bb.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include <gr_count_bits.h>
+#include <cstdio>
+#include <iostream>
+
+#define VERBOSE 0
+
+
+gr_correlate_access_code_tag_bb_sptr
+gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, const std::string &tag_name)
+{
+  return gnuradio::get_initial_sptr(new gr_correlate_access_code_tag_bb (access_code, threshold, tag_name));
+}
+
+
+gr_correlate_access_code_tag_bb::gr_correlate_access_code_tag_bb (
+  const std::string &access_code, int threshold, const std::string &tag_name)
+  : gr_sync_block ("correlate_access_code_tag_bb",
+		   gr_make_io_signature (1, 1, sizeof(char)),
+		   gr_make_io_signature (1, 1, sizeof(char))),
+    d_data_reg(0), d_mask(0), d_len(0),
+    d_threshold(threshold)
+
+{
+  if (!set_access_code(access_code)){
+    fprintf(stderr, "gr_correlate_access_code_tag_bb: access_code is > 64 bits\n");
+    throw std::out_of_range ("access_code is > 64 bits");
+  }
+
+  std::stringstream str;
+  str << name() << unique_id();
+  d_me = pmt::pmt_string_to_symbol(str.str());
+  d_key = pmt::pmt_string_to_symbol(tag_name);
+}
+
+gr_correlate_access_code_tag_bb::~gr_correlate_access_code_tag_bb ()
+{
+}
+
+bool
+gr_correlate_access_code_tag_bb::set_access_code(
+  const std::string &access_code)
+{
+  d_len = access_code.length();	// # of bytes in string
+  if (d_len > 64)
+    return false;
+
+  // set len top bits to 1.
+  d_mask = ((~0ULL) >> (64 - d_len)) << (64 - d_len);
+
+  d_access_code = 0;
+  for (unsigned i=0; i < 64; i++){
+    d_access_code <<= 1;
+    if (i < d_len)
+      d_access_code |= access_code[i] & 1;	// look at LSB only
+  }
+
+  return true;
+}
+
+int
+gr_correlate_access_code_tag_bb::work (int noutput_items,
+				   gr_vector_const_void_star &input_items,
+				   gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *) input_items[0];
+  unsigned char *out = (unsigned char *) output_items[0];
+
+  uint64_t abs_out_sample_cnt = nitems_written(0);
+
+  for (int i = 0; i < noutput_items; i++){
+
+    out[i] = in[i];
+    
+    // compute hamming distance between desired access code and current data
+    unsigned long long wrong_bits = 0;
+    unsigned int nwrong = d_threshold+1;
+    int new_flag = 0;
+
+    wrong_bits  = (d_data_reg ^ d_access_code) & d_mask;
+    nwrong = gr_count_bits64(wrong_bits);
+
+    // test for access code with up to threshold errors
+    new_flag = (nwrong <= d_threshold);
+
+    // shift in new data and new flag
+    d_data_reg = (d_data_reg << 1) | (in[i] & 0x1);
+    if (new_flag) {
+      if(VERBOSE) std::cout << "writing tag at sample " << abs_out_sample_cnt + i << std::endl;
+      add_item_tag(0, //stream ID
+	    abs_out_sample_cnt + i - 64 + d_len, //sample
+	    d_key,      //frame info
+	    pmt::pmt_t(), //data (unused)
+        d_me        //block src id
+      );
+    }
+  }
+
+  return noutput_items;
+}
+  
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
new file mode 100644
index 000000000..1067bbc56
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
@@ -0,0 +1,86 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2011 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_gr_correlate_access_code_tag_bb_H
+#define INCLUDED_gr_correlate_access_code_tag_bb_H
+
+#include <gr_sync_block.h>
+#include <string>
+
+class gr_correlate_access_code_tag_bb;
+typedef boost::shared_ptr<gr_correlate_access_code_tag_bb> gr_correlate_access_code_tag_bb_sptr;
+
+/*!
+ * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
+ * \param threshold maximum number of bits that may be wrong
+ * \param tag_name key of the tag inserted into the tag stream
+ */
+gr_correlate_access_code_tag_bb_sptr 
+gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold,
+				      const std::string &tag_name);
+
+/*!
+ * \brief Examine input for specified access code, one bit at a time.
+ * \ingroup sync_blk
+ *
+ * input:  stream of bits, 1 bit per input byte (data in LSB)
+ * output: unaltered stream of bits (plus tags)
+ *
+ * This block annotates the input stream with tags. The tags have key
+ * name [tag_name], specified in the constructor. Used for searching
+ * an input data stream for preambles, etc.
+ */
+class gr_correlate_access_code_tag_bb : public gr_sync_block
+{
+  friend gr_correlate_access_code_tag_bb_sptr 
+  gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold,
+					const std::string &tag_name);
+ private:
+  unsigned long long d_access_code;	// access code to locate start of packet
+                                        //   access code is left justified in the word
+  unsigned long long d_data_reg;	// used to look for access_code
+  unsigned long long d_mask;		// masks access_code bits (top N bits are set where
+                                        //   N is the number of bits in the access code)
+  unsigned int	     d_threshold;	// how many bits may be wrong in sync vector
+  unsigned int       d_len;         //the length of the access code
+
+  pmt::pmt_t d_key, d_me; //d_key is the tag name, d_me is the block name + unique ID
+
+ protected:
+  gr_correlate_access_code_tag_bb(const std::string &access_code, int threshold,
+				  const std::string &tag_name);
+
+ public:
+  ~gr_correlate_access_code_tag_bb();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+  
+  /*!
+   * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
+   */
+  bool set_access_code (const std::string &access_code);
+};
+
+#endif /* INCLUDED_gr_correlate_access_code_tag_bb_H */
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.i b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.i
new file mode 100644
index 000000000..fb832194d
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.i
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,correlate_access_code_tag_bb);
+
+/*!
+ * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
+ * \param threshold maximum number of bits that may be wrong
+ */
+gr_correlate_access_code_tag_bb_sptr 
+gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, const std::string &tag_name) 
+  throw(std::out_of_range);
+
+/*!
+ * \brief Examine input for specified access code, one bit at a time.
+ * \ingroup block
+ *
+ * input:  stream of bits, 1 bit per input byte (data in LSB)
+ * output: stream of bits, 2 bits per output byte (data in LSB, flag in next higher bit)
+ *
+ * Each output byte contains two valid bits, the data bit, and the
+ * flag bit.  The LSB (bit 0) is the data bit, and is the original
+ * input data, delayed 64 bits.  Bit 1 is the
+ * flag bit and is 1 if the corresponding data bit is the first data
+ * bit following the access code. Otherwise the flag bit is 0.
+ */
+class gr_correlate_access_code_tag_bb : public gr_sync_block
+{
+  friend gr_correlate_access_code_tag_bb_sptr 
+  gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold, const std::string &tag_name);
+ protected:
+  gr_correlate_access_code_tag_bb(const std::string &access_code, int threshold, const std::string &tag_name);
+
+ public:
+  ~gr_correlate_access_code_tag_bb();
+
+  /*!
+   * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
+   */
+  bool set_access_code (const std::string &access_code);
+};
diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
index a29acd628..df6de93d5 100644
--- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
+++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
@@ -44,6 +44,8 @@ class gr_quadrature_demod_cf : public gr_sync_block
   float		d_gain;
 
  public:
+  void set_gain(float gain) { d_gain = gain; }
+  float gain() const { return d_gain; }
 
   int work (int noutput_items,
 		 gr_vector_const_void_star &input_items,
diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
index fbd45dcf8..d9f338daa 100644
--- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
+++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.i
@@ -27,4 +27,8 @@ gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
 class gr_quadrature_demod_cf : public gr_sync_block
 {
   gr_quadrature_demod_cf (float gain);
+
+public:
+  void set_gain(float gain) { d_gain = gain; }
+  float gain() const { return d_gain; }
 };
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
index 91618bad6..67184b9c5 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
@@ -183,7 +183,8 @@ gr_tagged_file_sink::work (int noutput_items,
 	  //std::cout << "Found end of burst: "
 	  //	    << idx_stop << ", " << N << std::endl;
 
-	  int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize, idx_stop-idx, d_handle);
+	  int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize,
+			      idx_stop-idx, d_handle);
 	  if (count == 0) {
 	    if(ferror(d_handle)) {
 	      perror("gr_tagged_file_sink: error writing file");
@@ -200,7 +201,8 @@ gr_tagged_file_sink::work (int noutput_items,
 	}
       }
       if(d_state == IN_BURST) {
-	int count = fwrite (&inbuf[idx], d_itemsize, noutput_items-idx, d_handle);
+	int count = fwrite (&inbuf[d_itemsize*idx], d_itemsize,
+			    noutput_items-idx, d_handle);
 	if (count == 0) {
 	  if(ferror(d_handle)) {
 	    perror("gr_tagged_file_sink: error writing file");
diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index e0c1b1d15..ded4e743d 100644
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -21,7 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = c++
+SUBDIRS =
+
 if PYTHON
 SUBDIRS += python grc
 endif
diff --git a/gnuradio-examples/c++/.gitignore b/gnuradio-examples/c++/.gitignore
deleted file mode 100644
index 19dd0e0a5..000000000
--- a/gnuradio-examples/c++/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/dialtone
diff --git a/gnuradio-examples/grc/trellis/interference_cancellation.grc b/gnuradio-examples/grc/trellis/interference_cancellation.grc
index e93babd78..7674b4bf1 100644
--- a/gnuradio-examples/grc/trellis/interference_cancellation.grc
+++ b/gnuradio-examples/grc/trellis/interference_cancellation.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Thu Mar 19 11:22:40 2009</timestamp>
+  <timestamp>Wed Aug 31 17:40:25 2011</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -36,6 +36,14 @@
       <value>Custom</value>
     </param>
     <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>realtime_scheduling</key>
       <value></value>
     </param>
@@ -79,18 +87,22 @@
       <value>100</value>
     </param>
     <param>
-      <key>slider_length</key>
-      <value>200</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
       <value></value>
     </param>
     <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(243, 11)</value>
     </param>
@@ -130,18 +142,22 @@
       <value>100</value>
     </param>
     <param>
-      <key>slider_length</key>
-      <value>200</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
       <value></value>
     </param>
     <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(447, 14)</value>
     </param>
@@ -213,41 +229,6 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
-    <param>
-      <key>id</key>
-      <value>gr_chunks_to_symbols_xx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>in_type</key>
-      <value>short</value>
-    </param>
-    <param>
-      <key>out_type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>symbol_table</key>
-      <value>1,1j,-1j,-1</value>
-    </param>
-    <param>
-      <key>dimension</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(665, 187)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>gr_multiply_const_vxx</key>
     <param>
       <key>id</key>
@@ -344,6 +325,10 @@
       <value>1</value>
     </param>
     <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(660, 311)</value>
     </param>
@@ -638,6 +623,10 @@
       <value>1</value>
     </param>
     <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(405, 998)</value>
     </param>
@@ -816,6 +805,10 @@
       <value>1</value>
     </param>
     <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(420, 1368)</value>
     </param>
@@ -968,10 +961,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>trellis_encoder_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_2</value>
+      <value>trellis_encoder_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -979,71 +972,74 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>ss</value>
     </param>
     <param>
-      <key>title</key>
-      <value>BER 2 (raw)</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>_coordinate</key>
+      <value>(336, 311)</value>
     </param>
     <param>
-      <key>base_value</key>
-      <value>0.0</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
-      <key>min_value</key>
-      <value>0</value>
+      <key>id</key>
+      <value>trellis_viterbi_combined_xx_1</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>type</key>
+      <value>c</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>out_type</key>
+      <value>s</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>block_size</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>final_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>dim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>True</value>
+      <key>table</key>
+      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0,1,1,1</value>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1260, 659)</value>
+      <value>(79, 501)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1051,10 +1047,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_3</value>
+      <value>trellis_viterbi_combined_xx_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1062,71 +1058,74 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>c</value>
     </param>
     <param>
-      <key>title</key>
-      <value>BER 2 (after cancelling user 1)</value>
+      <key>out_type</key>
+      <value>s</value>
     </param>
     <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>block_size</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>base_value</key>
-      <value>0.0</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>min_value</key>
-      <value>0</value>
+      <key>final_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>dim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>table</key>
+      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(82, 766)</value>
     </param>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_encoder_xx</key>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>trellis_encoder_xx_2</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>type</key>
+      <value>ss</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>True</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,1,1,1</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1262, 1020)</value>
+      <value>(89, 998)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1134,10 +1133,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_3_0</value>
+      <value>trellis_viterbi_combined_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1145,71 +1144,74 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>c</value>
     </param>
     <param>
-      <key>title</key>
-      <value>BER 1 (after cancelling user 2)</value>
+      <key>out_type</key>
+      <value>s</value>
     </param>
     <param>
-      <key>units</key>
-      <value>BER</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>R</value>
+      <key>block_size</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>base_value</key>
-      <value>0.0</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>min_value</key>
-      <value>0</value>
+      <key>final_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>dim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>1.0</value>
+      <key>table</key>
+      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>6</value>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(83, 1111)</value>
     </param>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_encoder_xx</key>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>id</key>
+      <value>trellis_encoder_xx_2_0</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0.001</value>
+      <key>type</key>
+      <value>ss</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>True</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1,0,1,1</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1269, 1417)</value>
+      <value>(105, 1367)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1217,53 +1219,54 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>trellis_viterbi_combined_xx</key>
     <param>
       <key>id</key>
-      <value>R</value>
+      <value>trellis_viterbi_combined_xx_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>10e3</value>
+      <key>type</key>
+      <value>c</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(748, 12)</value>
+      <key>out_type</key>
+      <value>s</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_encoder_xx</key>
     <param>
-      <key>id</key>
-      <value>trellis_encoder_xx_0</value>
+      <key>block_size</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>init_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>type</key>
-      <value>ss</value>
+      <key>final_state</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>dim</key>
+      <value>1</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>table</key>
+      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(334, 190)</value>
+      <value>(75, 1495)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1271,10 +1274,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_1</value>
+      <value>gr_add_xx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1282,19 +1285,19 @@
     </param>
     <param>
       <key>type</key>
-      <value>ss</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(336, 311)</value>
+      <value>(1400, 262)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1302,10 +1305,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_1</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1313,43 +1316,63 @@
     </param>
     <param>
       <key>type</key>
-      <value>c</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>title</key>
+      <value>Scope Plot</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>v_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>v_offset</key>
+      <value>0</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>t_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>dim</key>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
       <value>1</value>
     </param>
     <param>
-      <key>table</key>
-      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(79, 501)</value>
+      <value>(1533, 149)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1357,54 +1380,53 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_2</value>
+      <value>prefix</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>c</value>
-    </param>
-    <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>_coordinate</key>
+      <value>(871, 14)</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>trellis_encoder_xx</key>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>id</key>
+      <value>trellis_encoder_xx_0</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>type</key>
+      <value>ss</value>
     </param>
     <param>
-      <key>table</key>
-      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+      <key>fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>init_state</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(82, 766)</value>
+      <value>(340, 187)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1412,10 +1434,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_2</value>
+      <value>gr_throttle_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1423,19 +1445,19 @@
     </param>
     <param>
       <key>type</key>
-      <value>ss</value>
+      <value>short</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>samples_per_second</key>
+      <value>R</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(89, 998)</value>
+      <value>(534, 149)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1443,54 +1465,61 @@
     </param>
   </block>
   <block>
-    <key>trellis_viterbi_combined_xx</key>
+    <key>gr_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>trellis_viterbi_combined_xx_0</value>
+      <value>gr_chunks_to_symbols_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>c</value>
+      <key>in_type</key>
+      <value>short</value>
     </param>
     <param>
       <key>out_type</key>
-      <value>s</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>symbol_table</key>
+      <value>1,1j,-1j,-1</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>_coordinate</key>
+      <value>(682, 186)</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>table</key>
-      <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value>
+      <key>id</key>
+      <value>R</value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>100e3</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(83, 1111)</value>
+      <value>(748, 12)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1498,10 +1527,10 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>trellis_encoder_xx_2_0</value>
+      <value>wxgui_numbersink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1509,74 +1538,75 @@
     </param>
     <param>
       <key>type</key>
-      <value>ss</value>
+      <value>float</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>title</key>
+      <value>BER 1 (raw)</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>units</key>
+      <value>BER</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(105, 1367)</value>
+      <key>samp_rate</key>
+      <value>R</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>min_value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>trellis_viterbi_combined_xx</key>
     <param>
-      <key>id</key>
-      <value>trellis_viterbi_combined_xx_0_0</value>
+      <key>max_value</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>factor</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>c</value>
+      <key>decimal_places</key>
+      <value>6</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>s</value>
+      <key>ref_level</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value>
+      <key>number_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>block_size</key>
-      <value>1000</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>-1</value>
+      <key>average</key>
+      <value>True</value>
     </param>
     <param>
-      <key>final_state</key>
-      <value>-1</value>
+      <key>avg_alpha</key>
+      <value>0.001</value>
     </param>
     <param>
-      <key>dim</key>
-      <value>1</value>
+      <key>show_gauge</key>
+      <value>True</value>
     </param>
     <param>
-      <key>table</key>
-      <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>metric_type</key>
-      <value>trellis.TRELLIS_EUCLIDEAN</value>
+      <key>grid_pos</key>
+      <value>0,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(75, 1495)</value>
+      <value>(1267, 410)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1584,53 +1614,86 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>prefix</value>
+      <value>wxgui_numbersink2_2</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>"../../../"</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(871, 14)</value>
+      <key>title</key>
+      <value>BER 2 (raw)</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>gr_add_xx</key>
     <param>
-      <key>id</key>
-      <value>gr_add_xx_1</value>
+      <key>max_value</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>avg_alpha</key>
+      <value>0.001</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>show_gauge</key>
+      <value>True</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0,1,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1400, 262)</value>
+      <value>(1260, 659)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1641,7 +1704,7 @@
     <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2_0</value>
+      <value>wxgui_numbersink2_3</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1653,7 +1716,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>BER 1 (raw)</value>
+      <value>BER 2 (after cancelling user 1)</value>
     </param>
     <param>
       <key>units</key>
@@ -1664,16 +1727,12 @@
       <value>R</value>
     </param>
     <param>
-      <key>base_value</key>
-      <value>0.0</value>
-    </param>
-    <param>
       <key>min_value</key>
       <value>0</value>
     </param>
     <param>
       <key>max_value</key>
-      <value>1</value>
+      <value>1.0</value>
     </param>
     <param>
       <key>factor</key>
@@ -1697,7 +1756,7 @@
     </param>
     <param>
       <key>average</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>avg_alpha</key>
@@ -1708,12 +1767,20 @@
       <value>True</value>
     </param>
     <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
       <key>grid_pos</key>
-      <value>0,0,1,1</value>
+      <value>1,1,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1267, 410)</value>
+      <value>(1262, 1020)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1721,10 +1788,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>wxgui_numbersink2_3_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1732,43 +1799,75 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>float</value>
     </param>
     <param>
       <key>title</key>
-      <value>Scope Plot</value>
+      <value>BER 1 (after cancelling user 2)</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
     </param>
     <param>
       <key>samp_rate</key>
       <value>R</value>
     </param>
     <param>
-      <key>v_scale</key>
+      <key>min_value</key>
       <value>0</value>
     </param>
     <param>
-      <key>t_scale</key>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
       <value>0</value>
     </param>
     <param>
-      <key>ac_couple</key>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
       <value>False</value>
     </param>
     <param>
-      <key>xy_mode</key>
+      <key>average</key>
       <value>True</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
       <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1533, 149)</value>
+      <value>(1269, 1417)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1782,12 +1881,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>trellis_encoder_xx_0</source_block_id>
-    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>trellis_encoder_xx_1</source_block_id>
     <sink_block_id>gr_chunks_to_symbols_xx_1</sink_block_id>
     <source_key>0</source_key>
@@ -2069,4 +2162,16 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>trellis_encoder_xx_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
 </flow_graph>
diff --git a/gnuradio-examples/grc/trellis/pccc.grc b/gnuradio-examples/grc/trellis/pccc.grc
new file mode 100644
index 000000000..c3111c321
--- /dev/null
+++ b/gnuradio-examples/grc/trellis/pccc.grc
@@ -0,0 +1,832 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Thu Sep  1 12:53:13 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>sccc1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Serially Concatenated Convolutional Code</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>AA</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>gnuradio flow graph</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>2048, 2048</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10**(-snr_db/10)</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(389, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>prefix</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(590, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(764, 16)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>snr_db</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>SNR (dB)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-10</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(229, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_xx_2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(392, 591)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
+    <param>
+      <key>id</key>
+      <value>gr_short_to_float_1_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(535, 609)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_numbersink2_3_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(713, 426)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(672, 290)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(952, 73)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(21, 170)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
+    <param>
+      <key>id</key>
+      <value>gr_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(517, 103)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_chunks_to_symbols_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_chunks_to_symbols_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>in_type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>symbol_table</key>
+      <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0,   0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value>
+    </param>
+    <param>
+      <key>dimension</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(551, 184)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_pccc_encoder_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_pccc_encoder_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ss</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>interleaver_args</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>bl</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(236, 147)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>100e3</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(482, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_add_xx_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(951, 256)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_pccc_decoder_combined_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_pccc_decoder_combined_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>o_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>interleaver</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>iterations</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>dim</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>table</key>
+      <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0,   0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
+    </param>
+    <param>
+      <key>siso_type</key>
+      <value>trellis.TRELLIS_MIN_SUM</value>
+    </param>
+    <param>
+      <key>scaling</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(196, 274)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sub_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_sub_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(217, 597)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_xx_2_0</source_block_id>
+    <sink_block_id>gr_short_to_float_1_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_short_to_float_1_0</source_block_id>
+    <sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_pccc_encoder_xx_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>trellis_pccc_decoder_combined_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_pccc_decoder_combined_xx_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/trellis/pccc1.grc b/gnuradio-examples/grc/trellis/pccc1.grc
new file mode 100644
index 000000000..15a63707e
--- /dev/null
+++ b/gnuradio-examples/grc/trellis/pccc1.grc
@@ -0,0 +1,857 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Wed Aug 31 20:34:39 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>sccc1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Serially Concatenated Convolutional Code</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>AA</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>gnuradio flow graph</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>2048, 2048</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10**(-snr_db/10)</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(389, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>prefix</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(590, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(764, 16)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>snr_db</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>SNR (dB)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-10</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(229, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_xx_2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(392, 591)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
+    <param>
+      <key>id</key>
+      <value>gr_short_to_float_1_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(535, 609)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_numbersink2_3_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(713, 426)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(672, 290)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_add_xx_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(951, 256)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(952, 73)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(21, 170)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
+    <param>
+      <key>id</key>
+      <value>gr_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(517, 103)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sub_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_sub_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(217, 597)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_chunks_to_symbols_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_chunks_to_symbols_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>in_type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>symbol_table</key>
+      <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0,   0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value>
+    </param>
+    <param>
+      <key>dimension</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(551, 184)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_pccc_encoder_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_pccc_encoder_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ss</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>interleaver_args</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>bl</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(236, 147)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_pccc_decoder_x</key>
+    <param>
+      <key>id</key>
+      <value>trellis_pccc_decoder_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>o_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>interleaver</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>iterations</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>siso_type</key>
+      <value>trellis.TRELLIS_MIN_SUM</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(357, 304)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_metrics_x</key>
+    <param>
+      <key>id</key>
+      <value>trellis_metrics_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>card</key>
+      <value>16</value>
+    </param>
+    <param>
+      <key>dim</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>table</key>
+      <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0,   0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(58, 354)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>100e3</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(482, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_xx_2_0</source_block_id>
+    <sink_block_id>gr_short_to_float_1_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_short_to_float_1_0</source_block_id>
+    <sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>trellis_metrics_x_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_pccc_encoder_xx_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_metrics_x_0</source_block_id>
+    <sink_block_id>trellis_pccc_decoder_x_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_pccc_decoder_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/trellis/readme.txt b/gnuradio-examples/grc/trellis/readme.txt
index d620fd628..9c7363af8 100644
--- a/gnuradio-examples/grc/trellis/readme.txt
+++ b/gnuradio-examples/grc/trellis/readme.txt
@@ -1,5 +1,7 @@
-This is an example of using gr-trellis in grc.
+These are examples of using gr-trellis in grc.
 
+INTERFERENCE CANCELLATION
+-------------------------
 Two users are transmitting simultaneously using convolutionally encoded QPSK, each with power P1=alpha*P and P2=(1-alpha)*P.
 The combined signal is observed in noise and four different receivers are considered:
 1) A viterbi decoder decoding user 1 assuming user 2 is noise
@@ -13,4 +15,18 @@ The combined signal is observed in noise and four different receivers are consid
 
 You can change the signal to noise ratio P/sigma^2 and the allocation of power to the two users, alpha.
 
+
+Serially Concatenated Convolutional Codes
+-----------------------------------------
+An SCCC can be defined by an outer and an inner FSM together with an interleaver
+and a modulation type. You can change the SNR and observe the estimated BER.
+In sccc.grc the decoding and metric calculation are combined; in sccc1.grc they are separate.
+
+Parallel Concatenated Convolutional Codes
+-----------------------------------------
+A PCCC can be defined by two FSMs together with an interleaver
+and a modulation type. You can change the SNR and observe the estimated BER.
+In pccc1.grc the decoding and metric calculation are separate.
+
+
 Enjoy.
diff --git a/gnuradio-examples/grc/trellis/sccc.grc b/gnuradio-examples/grc/trellis/sccc.grc
new file mode 100644
index 000000000..e8f656f63
--- /dev/null
+++ b/gnuradio-examples/grc/trellis/sccc.grc
@@ -0,0 +1,832 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Wed Aug 31 19:57:09 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>sccc</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Serially Concatenated Convolutional Code</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>AA</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>gnuradio flow graph</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>2048, 2048</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10**(-snr_db/10)</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(389, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(21, 170)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>prefix</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(590, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(764, 16)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_add_xx_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(951, 256)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sub_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_sub_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(445, 517)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_xx_2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(228.25, 798.39170361874085)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
+    <param>
+      <key>id</key>
+      <value>gr_short_to_float_1_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(416, 815)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>snr_db</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>SNR (dB)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-10</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(229, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10e3</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(482, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(952, 73)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
+    <param>
+      <key>id</key>
+      <value>gr_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(514, 105)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_chunks_to_symbols_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_chunks_to_symbols_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>in_type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>symbol_table</key>
+      <value>1,0,1j,0,-1j,0,-1,0,   0,1,0,1j,0,-1j,0,-1</value>
+    </param>
+    <param>
+      <key>dimension</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(551, 184)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(672, 290)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_sccc_encoder_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_sccc_encoder_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ss</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>interleaver_args</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>bl</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(242, 154)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_numbersink2_3_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(688, 572)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_sccc_decoder_combined_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_sccc_decoder_combined_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>c</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>o_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>interleaver</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>iterations</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>dim</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>table</key>
+      <value>1,0,1j,0,-1j,0,-1,0,   0,1,0,1j,0,-1j,0,-1</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
+    </param>
+    <param>
+      <key>siso_type</key>
+      <value>trellis.TRELLIS_SUM_PRODUCT</value>
+    </param>
+    <param>
+      <key>scaling</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(159, 335)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_sccc_encoder_xx_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>trellis_sccc_decoder_combined_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_sccc_decoder_combined_xx_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_xx_2_0</source_block_id>
+    <sink_block_id>gr_short_to_float_1_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_short_to_float_1_0</source_block_id>
+    <sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/trellis/sccc1.grc b/gnuradio-examples/grc/trellis/sccc1.grc
new file mode 100644
index 000000000..0be59d0c4
--- /dev/null
+++ b/gnuradio-examples/grc/trellis/sccc1.grc
@@ -0,0 +1,857 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Wed Aug 31 20:09:23 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>sccc1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Serially Concatenated Convolutional Code</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>AA</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>gnuradio flow graph</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>2048, 2048</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10**(-snr_db/10)</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(389, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(21, 170)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>prefix</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(590, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(764, 16)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>snr_db</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>SNR (dB)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-10</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(229, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10e3</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(482, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_sccc_encoder_xx</key>
+    <param>
+      <key>id</key>
+      <value>trellis_sccc_encoder_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ss</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>interleaver_args</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>bl</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(242, 154)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_sccc_decoder_x</key>
+    <param>
+      <key>id</key>
+      <value>trellis_sccc_decoder_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>o_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value>
+    </param>
+    <param>
+      <key>o_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>o_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>i_fsm_args</key>
+      <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value>
+    </param>
+    <param>
+      <key>i_init_state</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>i_final_state</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>interleaver</key>
+      <value>trellis.interleaver(block,666)</value>
+    </param>
+    <param>
+      <key>block_size</key>
+      <value>block</value>
+    </param>
+    <param>
+      <key>iterations</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>siso_type</key>
+      <value>trellis.TRELLIS_MIN_SUM</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(333, 305)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sub_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_sub_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(217, 597)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_xx_2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(392, 591)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_short_to_float</key>
+    <param>
+      <key>id</key>
+      <value>gr_short_to_float_1_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(535, 609)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_numbersink2_3_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>6</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0.001</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1,0,1,1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(713, 426)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noisevar</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(672, 290)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_add_xx_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(951, 256)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>trellis_metrics_x</key>
+    <param>
+      <key>id</key>
+      <value>trellis_metrics_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>card</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>dim</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>table</key>
+      <value>-7, -5, -3, -1, 1, 3, 5, 7</value>
+    </param>
+    <param>
+      <key>metric_type</key>
+      <value>trellis.TRELLIS_EUCLIDEAN</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(58, 354)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
+    <param>
+      <key>id</key>
+      <value>gr_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(517, 103)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>R</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(952, 73)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_chunks_to_symbols_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_chunks_to_symbols_xx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>in_type</key>
+      <value>short</value>
+    </param>
+    <param>
+      <key>out_type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>symbol_table</key>
+      <value>-7, -5, -3, -1, 1, 3, 5, 7</value>
+    </param>
+    <param>
+      <key>dimension</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_ports</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(551, 184)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>gr_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_noise_source_x_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_chunks_to_symbols_xx_0</source_block_id>
+    <sink_block_id>gr_add_xx_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_sccc_encoder_xx_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_xx_2_0</source_block_id>
+    <sink_block_id>gr_short_to_float_1_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_short_to_float_1_0</source_block_id>
+    <sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sub_xx_0</source_block_id>
+    <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx_1</source_block_id>
+    <sink_block_id>trellis_metrics_x_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_metrics_x_0</source_block_id>
+    <sink_block_id>trellis_sccc_decoder_x_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>trellis_sccc_decoder_x_0</source_block_id>
+    <sink_block_id>gr_sub_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/python/Makefile.am b/gnuradio-examples/python/Makefile.am
index ea03b438f..65021729a 100644
--- a/gnuradio-examples/python/Makefile.am
+++ b/gnuradio-examples/python/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2007,2009 Free Software Foundation, Inc.
+# Copyright 2004,2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = \
 	apps \
-	audio \
 	digital \
 	digital-bert \
 	digital_voice \
@@ -33,5 +32,6 @@ SUBDIRS = \
 	network \
 	ofdm \
 	pfb \
+	tags \
 	usrp \
 	usrp2
diff --git a/gnuradio-examples/python/tags/.gitignore b/gnuradio-examples/python/tags/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gnuradio-examples/python/tags/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gnuradio-examples/python/tags/Makefile.am b/gnuradio-examples/python/tags/Makefile.am
new file mode 100644
index 000000000..5d71bf9b0
--- /dev/null
+++ b/gnuradio-examples/python/tags/Makefile.am
@@ -0,0 +1,29 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+ourdatadir = $(exampledir)/tags
+
+dist_ourdata_SCRIPTS =		\
+	test_file_tags.py	\
+	uhd_burst_detector.py
+
diff --git a/gnuradio-examples/python/tags/uhd_burst_detector.py b/gnuradio-examples/python/tags/uhd_burst_detector.py
index f8ebbe66a..ffa419562 100755
--- a/gnuradio-examples/python/tags/uhd_burst_detector.py
+++ b/gnuradio-examples/python/tags/uhd_burst_detector.py
@@ -1,4 +1,24 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import eng_notation
 from gnuradio import gr
@@ -9,16 +29,16 @@ from gnuradio.gr import firdes
 from optparse import OptionParser
 
 class uhd_burst_detector(gr.top_block):
-    def __init__(self, frequency, sample_rate,
-                 uhd_address="192.168.10.2", trigger=False):
+    def __init__(self, uhd_address, options):
 
         gr.top_block.__init__(self)
 
-        self.freq = frequency
-        self.samp_rate = sample_rate
         self.uhd_addr = uhd_address
-        self.gain = 32
-        self.trigger = trigger
+        self.freq = options.freq
+        self.samp_rate = options.samp_rate
+        self.gain = options.gain
+        self.threshold = options.threshold
+        self.trigger = options.trigger
         
         self.uhd_src = uhd.single_usrp_source(
             device_addr=self.uhd_addr,
@@ -32,7 +52,6 @@ class uhd_burst_detector(gr.top_block):
 
         taps = firdes.low_pass_2(1, 1, 0.4, 0.1, 60)
         self.chanfilt = gr.fir_filter_ccc(10, taps)
-        self.ann0 = gr.annotator_alltoall(100000, gr.sizeof_gr_complex)
         self.tagger = gr.burst_tagger(gr.sizeof_gr_complex)
 
         # Dummy signaler to collect a burst on known periods
@@ -40,11 +59,18 @@ class uhd_burst_detector(gr.top_block):
         self.signal = gr.vector_source_s(data, True)
 
         # Energy detector to get signal burst
+        ## use squelch to detect energy
+        self.det  = gr.simple_squelch_cc(self.threshold, 0.01)
+        ## convert to mag squared (float)
         self.c2m = gr.complex_to_mag_squared()
-        self.iir = gr.single_pole_iir_filter_ff(0.0001)
-        self.sub = gr.sub_ff()
-        self.mult = gr.multiply_const_ff(32768)
+        ## average to debounce
+        self.avg = gr.single_pole_iir_filter_ff(0.01)
+        ## rescale signal for conversion to short
+        self.scale = gr.multiply_const_ff(2**16)
+        ## signal input uses shorts
         self.f2s = gr.float_to_short()
+
+        # Use file sink burst tagger to capture bursts
         self.fsnk = gr.tagged_file_sink(gr.sizeof_gr_complex, self.samp_rate)
         
 
@@ -60,17 +86,12 @@ class uhd_burst_detector(gr.top_block):
 
         else:
             # Connect an energy detector signaler to the burst tagger
-            self.connect((self.uhd_src, 0), (self.c2m, 0))
-            self.connect((self.c2m, 0), (self.sub, 0))
-            self.connect((self.c2m, 0), (self.iir, 0))
-            self.connect((self.iir, 0), (self.sub, 1))
-            self.connect((self.sub, 0), (self.mult,0))
-            self.connect((self.mult, 0), (self.f2s, 0))
-            self.connect((self.f2s, 0), (self.tagger, 1))
+            self.connect(self.uhd_src, self.det)
+            self.connect(self.det, self.c2m, self.avg, self.scale, self.f2s)
+            self.connect(self.f2s, (self.tagger, 1))
         
     def set_samp_rate(self, samp_rate):
         self.samp_rate = samp_rate
-        self.wxgui_fftsink2_0.set_sample_rate(self.samp_rate/10)
         self.uhd_src_0.set_samp_rate(self.samp_rate)
             
 if __name__ == '__main__':
@@ -83,16 +104,15 @@ if __name__ == '__main__':
                       help="set frequency to FREQ", metavar="FREQ")
     parser.add_option("-g", "--gain", type="eng_float", default=0,
                       help="set gain in dB [default=%default]")
-    parser.add_option("-R", "--rate", type="eng_float", default=200000,
+    parser.add_option("-R", "--samp-rate", type="eng_float", default=200000,
                       help="set USRP sample rate [default=%default]")
+    parser.add_option("-t", "--threshold", type="float", default=-60,
+                      help="Set the detection power threshold (dBm) [default=%default")
     parser.add_option("-T", "--trigger", action="store_true", default=False,
                       help="Use internal trigger instead of detector [default=%default]")
     (options, args) = parser.parse_args()
     
-    frequency = options.freq
-    samp_rate = samp_rate = options.rate
     uhd_addr = options.address
-    trigger = options.trigger
 
-    tb = uhd_burst_detector(frequency, samp_rate, uhd_addr, trigger)
+    tb = uhd_burst_detector(uhd_addr, options)
     tb.run()
diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index bb0d05d07..cde1702f2 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib
+SUBDIRS = include lib examples
 
 if PYTHON
 SUBDIRS += grc swig
diff --git a/gr-audio/examples/.gitignore b/gr-audio/examples/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-audio/examples/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gnuradio-examples/c++/Makefile.am b/gr-audio/examples/Makefile.am
index 5a49e0e89..a2365d403 100644
--- a/gnuradio-examples/c++/Makefile.am
+++ b/gr-audio/examples/Makefile.am
@@ -20,4 +20,9 @@
 # 
 
 include $(top_srcdir)/Makefile.common
-SUBDIRS = audio
+
+SUBDIRS = c++
+
+if PYTHON
+SUBDIRS += python
+endif
diff --git a/gnuradio-examples/c++/audio/.gitignore b/gr-audio/examples/c++/.gitignore
index bb08aaf91..bb08aaf91 100644
--- a/gnuradio-examples/c++/audio/.gitignore
+++ b/gr-audio/examples/c++/.gitignore
diff --git a/gnuradio-examples/c++/audio/Makefile.am b/gr-audio/examples/c++/Makefile.am
index 88bd7c1fd..88bd7c1fd 100644
--- a/gnuradio-examples/c++/audio/Makefile.am
+++ b/gr-audio/examples/c++/Makefile.am
diff --git a/gnuradio-examples/c++/audio/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc
index e4e3d8ceb..e4e3d8ceb 100644
--- a/gnuradio-examples/c++/audio/dial_tone.cc
+++ b/gr-audio/examples/c++/dial_tone.cc
diff --git a/gnuradio-examples/python/audio/.gitignore b/gr-audio/examples/python/.gitignore
index c400497f5..b4813f3c8 100644
--- a/gnuradio-examples/python/audio/.gitignore
+++ b/gr-audio/examples/python/.gitignore
@@ -1,10 +1,4 @@
 /Makefile
 /Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
 /*.pyc
 /*.pyo
diff --git a/gnuradio-examples/python/audio/Makefile.am b/gr-audio/examples/python/Makefile.am
index 356b51559..356b51559 100644
--- a/gnuradio-examples/python/audio/Makefile.am
+++ b/gr-audio/examples/python/Makefile.am
diff --git a/gnuradio-examples/python/audio/audio_copy.py b/gr-audio/examples/python/audio_copy.py
index 3094c9f7a..3094c9f7a 100755
--- a/gnuradio-examples/python/audio/audio_copy.py
+++ b/gr-audio/examples/python/audio_copy.py
diff --git a/gnuradio-examples/python/audio/audio_fft.py b/gr-audio/examples/python/audio_fft.py
index 960e0f94d..960e0f94d 100755
--- a/gnuradio-examples/python/audio/audio_fft.py
+++ b/gr-audio/examples/python/audio_fft.py
diff --git a/gnuradio-examples/python/audio/audio_play.py b/gr-audio/examples/python/audio_play.py
index f9520c7cf..f9520c7cf 100755
--- a/gnuradio-examples/python/audio/audio_play.py
+++ b/gr-audio/examples/python/audio_play.py
diff --git a/gnuradio-examples/python/audio/audio_to_file.py b/gr-audio/examples/python/audio_to_file.py
index 0d54f7bd2..0d54f7bd2 100755
--- a/gnuradio-examples/python/audio/audio_to_file.py
+++ b/gr-audio/examples/python/audio_to_file.py
diff --git a/gnuradio-examples/python/audio/dial_tone.py b/gr-audio/examples/python/dial_tone.py
index 65c5e50b2..65c5e50b2 100755
--- a/gnuradio-examples/python/audio/dial_tone.py
+++ b/gr-audio/examples/python/dial_tone.py
diff --git a/gnuradio-examples/python/audio/dial_tone_daemon.py b/gr-audio/examples/python/dial_tone_daemon.py
index d30d0e117..d30d0e117 100755
--- a/gnuradio-examples/python/audio/dial_tone_daemon.py
+++ b/gr-audio/examples/python/dial_tone_daemon.py
diff --git a/gnuradio-examples/python/audio/dial_tone_wav.py b/gr-audio/examples/python/dial_tone_wav.py
index 6e87b2a48..6e87b2a48 100755
--- a/gnuradio-examples/python/audio/dial_tone_wav.py
+++ b/gr-audio/examples/python/dial_tone_wav.py
diff --git a/gnuradio-examples/python/audio/mono_tone.py b/gr-audio/examples/python/mono_tone.py
index 869c2e5ff..869c2e5ff 100755
--- a/gnuradio-examples/python/audio/mono_tone.py
+++ b/gr-audio/examples/python/mono_tone.py
diff --git a/gnuradio-examples/python/audio/multi_tone.py b/gr-audio/examples/python/multi_tone.py
index 7d47dd5d5..7d47dd5d5 100755
--- a/gnuradio-examples/python/audio/multi_tone.py
+++ b/gr-audio/examples/python/multi_tone.py
diff --git a/gnuradio-examples/python/audio/noise.py b/gr-audio/examples/python/noise.py
index 75f741082..75f741082 100755
--- a/gnuradio-examples/python/audio/noise.py
+++ b/gr-audio/examples/python/noise.py
diff --git a/gnuradio-examples/python/audio/spectrum_inversion.py b/gr-audio/examples/python/spectrum_inversion.py
index 021e23f2d..021e23f2d 100755
--- a/gnuradio-examples/python/audio/spectrum_inversion.py
+++ b/gr-audio/examples/python/spectrum_inversion.py
diff --git a/gnuradio-examples/python/audio/test_resampler.py b/gr-audio/examples/python/test_resampler.py
index 4644c5e2f..4644c5e2f 100755
--- a/gnuradio-examples/python/audio/test_resampler.py
+++ b/gr-audio/examples/python/test_resampler.py
diff --git a/gr-comedi/src/comedi_sink_s.cc b/gr-comedi/src/comedi_sink_s.cc
index d4a668758..fc5c14931 100644
--- a/gr-comedi/src/comedi_sink_s.cc
+++ b/gr-comedi/src/comedi_sink_s.cc
@@ -88,7 +88,7 @@ comedi_sink_s::comedi_sink_s (int sampling_freq,
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 
diff --git a/gr-comedi/src/comedi_source_s.cc b/gr-comedi/src/comedi_source_s.cc
index a52d04e2a..5d9f2f6b0 100644
--- a/gr-comedi/src/comedi_source_s.cc
+++ b/gr-comedi/src/comedi_source_s.cc
@@ -85,7 +85,7 @@ comedi_source_s::comedi_source_s (int sampling_freq,
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 
diff --git a/gr-howto-write-a-block/version.sh b/gr-howto-write-a-block/version.sh
index 8d4ff5200..759d52806 100644
--- a/gr-howto-write-a-block/version.sh
+++ b/gr-howto-write-a-block/version.sh
@@ -1,4 +1,4 @@
 MAJOR_VERSION=3
 API_COMPAT=4
-MINOR_VERSION=0
-MAINT_VERSION=0
+MINOR_VERSION=1
+MAINT_VERSION=git
diff --git a/gr-qtgui/.gitignore b/gr-qtgui/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-qtgui/.gitignore
+++ b/gr-qtgui/.gitignore
@@ -1,2 +1,3 @@
 /Makefile
 /Makefile.in
+/*.pc
diff --git a/gr-qtgui/lib/.gitignore b/gr-qtgui/lib/.gitignore
index fc4f8cdfe..7754ad227 100644
--- a/gr-qtgui/lib/.gitignore
+++ b/gr-qtgui/lib/.gitignore
@@ -10,6 +10,7 @@
 /spectrumdisplayform.ui.h
 /FrequencyDisplayPlot.moc.cc
 /ConstellationDisplayPlot.moc.cc
+/timedisplayform.moc.cc
 /gnuradio
 /guile
 /python
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/lib/spectrumUpdateEvents.h
index 5a17657b7..760619f88 100644
--- a/gr-qtgui/lib/spectrumUpdateEvents.h
+++ b/gr-qtgui/lib/spectrumUpdateEvents.h
@@ -101,7 +101,6 @@ public:
   int which() const;
   const std::vector<double*> getTimeDomainPoints() const;
   uint64_t getNumTimeDomainDataPoints() const;
-  timespec getDataTimestamp() const;
   bool getRepeatDataFlag() const;
 
 protected:
diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore
index 282522db0..26647d4c1 100644
--- a/gr-qtgui/swig/.gitignore
+++ b/gr-qtgui/swig/.gitignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+/qtgui_swig.py
+/python
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index 5a4ffd6fb..7cf8873e7 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -23,10 +23,10 @@
 %include "gnuradio.i"
 
 %{
-#include <qtgui_sink_c.h>
-#include <qtgui_sink_f.h>
-#include <qtgui_time_sink_c.h>
-#include <qtgui_time_sink_f.h>
+#include "qtgui_sink_c.h"
+#include "qtgui_sink_f.h"
+#include "qtgui_time_sink_c.h"
+#include "qtgui_time_sink_f.h"
 %}
 
 %include "qtgui_sink_c.i"
diff --git a/gr-trellis/Makefile.am b/gr-trellis/Makefile.am
index d68fb59c9..89d190ecf 100644
--- a/gr-trellis/Makefile.am
+++ b/gr-trellis/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src doc
+SUBDIRS = src grc doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-trellis.pc
diff --git a/gr-trellis/grc/.gitignore b/gr-trellis/grc/.gitignore
new file mode 100644
index 000000000..f3462d009
--- /dev/null
+++ b/gr-trellis/grc/.gitignore
@@ -0,0 +1,23 @@
+/Makefile
+/Makefile.in
+/aclocal.m4
+/configure
+/config.h.in
+/stamp-h.in
+/libtool
+/config.log
+/config.h
+/config.cache
+/config.status
+/missing
+/stamp-h
+/stamp-h1
+/.deps
+/.libs
+/*.la
+/*.lo
+/autom4te.cache
+/*.cache
+/missing
+/make.log
+/*.pc
diff --git a/gr-trellis/grc/Makefile.am b/gr-trellis/grc/Makefile.am
new file mode 100644
index 000000000..518c7f055
--- /dev/null
+++ b/gr-trellis/grc/Makefile.am
@@ -0,0 +1,39 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+grcblocksdir = $(grc_blocksdir)
+
+dist_grcblocks_DATA = \
+	trellis_encoder_xx.xml \
+	trellis_siso_combined_f.xml       \
+	trellis_viterbi_x.xml \
+	trellis_metrics_x.xml     \
+	trellis_siso_f.xml \
+	trellis_permutation.xml   \
+	trellis_viterbi_combined_xx.xml \
+        trellis_sccc_encoder_xx.xml \
+        trellis_sccc_decoder_x.xml \
+        trellis_sccc_decoder_combined_xx.xml \
+        trellis_pccc_encoder_xx.xml  \
+        trellis_pccc_decoder_x.xml  \
+        trellis_pccc_decoder_combined_xx.xml 
diff --git a/grc/blocks/trellis_encoder_xx.xml b/gr-trellis/grc/trellis_encoder_xx.xml
index 74a8cc346..639e948ec 100644
--- a/grc/blocks/trellis_encoder_xx.xml
+++ b/gr-trellis/grc/trellis_encoder_xx.xml
@@ -4,9 +4,11 @@
 ##Trellis Encoder
 ###################################################
  -->
+
 <block>
 	<name>Trellis Encoder</name>
 	<key>trellis_encoder_xx</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)</make>
 	<param>
@@ -58,6 +60,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<sink>
diff --git a/grc/blocks/trellis_metrics_x.xml b/gr-trellis/grc/trellis_metrics_x.xml
index 2016a34c2..ccb59a36e 100644
--- a/grc/blocks/trellis_metrics_x.xml
+++ b/gr-trellis/grc/trellis_metrics_x.xml
@@ -4,9 +4,12 @@
 ##Trellis Metrics
 ###################################################
  -->
+
+
 <block>
 	<name>Trellis Metrics</name>
 	<key>trellis_metrics_x</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.metrics_$(type)($card, $dim, $table, $metric_type)</make>
 	<callback>set_TABLE($table)</callback>
diff --git a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
new file mode 100644
index 000000000..ec58132f8
--- /dev/null
+++ b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## PCCC Decoder Combined
+###################################################
+ -->
+
+
+<block>
+	<name>PCCC Decoder Combo</name>
+	<key>trellis_pccc_decoder_combined_xx</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.pccc_decoder_combined_$(type)$(out_type)(
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
+		trellis.interleaver($interleaver), 
+		$block_size,
+		$iterations,
+                $siso_type,
+		$dim, $table, $metric_type,
+		$scaling)
+	</make>
+        <callback>set_TABLE($table)</callback>
+	<param>
+		<name>Input Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>c</key>
+			<opt>io:complex</opt>
+			<opt>table:complex_vector</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>f</key>
+			<opt>io:float</opt>
+			<opt>table:real_vector</opt>
+		</option>
+	</param>
+	<param>
+		<name>Output Type</name>
+		<key>out_type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>i</key>
+			<opt>io:int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>s</key>
+			<opt>io:short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>b</key>
+			<opt>io:byte</opt>
+		</option>
+	</param>
+	<param>
+		<name>FSM 1</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 1</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Final State 1</name>
+		<key>o_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>FSM 2</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 2</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Final State 2</name>
+		<key>i_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Block Size</name>
+		<key>block_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Iterations</name>
+		<key>iterations</key>
+		<value>10</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Dimensionality</name>
+		<key>dim</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Constellation</name>
+		<key>table</key>
+		<type>$type.table</type>
+	</param>
+	<param>
+		<name>Metric Type</name>
+		<key>metric_type</key>
+		<type>enum</type>
+		<option>
+			<name>Euclidean</name>
+			<key>trellis.TRELLIS_EUCLIDEAN</key>
+		</option>
+		<option>
+			<name>Hard Symbol</name>
+			<key>trellis.TRELLIS_HARD_SYMBOL</key>
+		</option>
+		<option>
+			<name>Hard Bit</name>
+			<key>trellis.TRELLIS_HARD_BIT</key>
+		</option>
+	</param>
+	<param>
+		<name>SISO Type</name>
+		<key>siso_type</key>
+		<type>enum</type>
+		<option>
+			<name>Min Sum</name>
+			<key>trellis.TRELLIS_MIN_SUM</key>
+		</option>
+		<option>
+			<name>Sum Product</name>
+			<key>trellis.TRELLIS_SUM_PRODUCT</key>
+		</option>
+	</param>
+	<param>
+		<name>Scaling</name>
+		<key>scaling</key>
+		<value>1.0</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type.io</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$out_type.io</type>
+	</source>
+	<doc>
+PCCC turbo Decoder combined with metric calculation.
+The fsm arguments are passed directly to the trellis.fsm() constructor.
+	</doc>
+</block>
diff --git a/gr-trellis/grc/trellis_pccc_decoder_x.xml b/gr-trellis/grc/trellis_pccc_decoder_x.xml
new file mode 100644
index 000000000..e6eb03f11
--- /dev/null
+++ b/gr-trellis/grc/trellis_pccc_decoder_x.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## PCCC Decoder 
+###################################################
+ -->
+
+
+<block>
+	<name>PCCC Decoder</name>
+	<key>trellis_pccc_decoder_x</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.pccc_decoder_$(out_type)(
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
+		trellis.interleaver($interleaver), 
+		$block_size,
+		$iterations,
+                $siso_type)
+	</make>
+	<param>
+		<name>Output Type</name>
+		<key>out_type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>i</key>
+			<opt>io:int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>s</key>
+			<opt>io:short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>b</key>
+			<opt>io:byte</opt>
+		</option>
+	</param>
+	<param>
+		<name>FSM 1</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 1</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Final State 1</name>
+		<key>o_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>FSM 2</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 2</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Final State 2</name>
+		<key>i_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Block Size</name>
+		<key>block_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Iterations</name>
+		<key>iterations</key>
+		<value>10</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>SISO Type</name>
+		<key>siso_type</key>
+		<type>enum</type>
+		<option>
+			<name>Min Sum</name>
+			<key>trellis.TRELLIS_MIN_SUM</key>
+		</option>
+		<option>
+			<name>Sum Product</name>
+			<key>trellis.TRELLIS_SUM_PRODUCT</key>
+		</option>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$out_type.io</type>
+	</source>
+	<doc>
+PCCC turbo Decoder.
+The fsm and interleaver arguments are passed directly to the trellis.fsm() and trellis.interleaver() constructors.
+	</doc>
+</block>
diff --git a/gr-trellis/grc/trellis_pccc_encoder_xx.xml b/gr-trellis/grc/trellis_pccc_encoder_xx.xml
new file mode 100644
index 000000000..6774f18d2
--- /dev/null
+++ b/gr-trellis/grc/trellis_pccc_encoder_xx.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## PCCC Encoder
+###################################################
+ -->
+
+<block>
+	<name>PCCC Encoder</name>
+	<key>trellis_pccc_encoder_xx</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.pccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state, trellis.fsm($i_fsm_args), $i_init_state, trellis.interleaver($interleaver_args), $bl)</make>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Byte->Byte</name>
+			<key>bb</key>
+			<opt>input:byte</opt>
+			<opt>output:byte</opt>
+		</option>
+		<option>
+			<name>Byte->Short</name>
+			<key>bs</key>
+			<opt>input:byte</opt>
+			<opt>output:short</opt>
+		</option>
+		<option>
+			<name>Byte->Int</name>
+			<key>bi</key>
+			<opt>input:byte</opt>
+			<opt>output:int</opt>
+		</option>
+		<option>
+			<name>Short->Short</name>
+			<key>ss</key>
+			<opt>input:short</opt>
+			<opt>output:short</opt>
+		</option>
+		<option>
+			<name>Short->Int</name>
+			<key>si</key>
+			<opt>input:short</opt>
+			<opt>output:int</opt>
+		</option>
+		<option>
+			<name>Int->Int</name>
+			<key>ii</key>
+			<opt>input:int</opt>
+			<opt>output:int</opt>
+		</option>
+	</param>
+	<param>
+		<name>FSM 1</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 1</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>FSM 2</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Initial State 2</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Blocklength</name>
+		<key>bl</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type.input</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type.output</type>
+	</source>
+	<doc>
+The fsm and interleaver arguments are passed directly to the trellis.fsm() and trellis.interleaver() constructors.
+	</doc>
+</block>
diff --git a/grc/blocks/trellis_permutation.xml b/gr-trellis/grc/trellis_permutation.xml
index 7721cc71d..125a78d4d 100644
--- a/grc/blocks/trellis_permutation.xml
+++ b/gr-trellis/grc/trellis_permutation.xml
@@ -4,11 +4,14 @@
 ##Trellis Permutation
 ###################################################
  -->
+
+
 <block>
 	<name>Trellis Permutation</name>
 	<key>trellis_permutation</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
-	<make>trellis.permutation($block_size, $table, $syms_per_block, $type.size*$vlen)</make>
+	<make>trellis.permutation($interleaver_size, $table, $syms_per_block, $type.size*$vlen)</make>
 	<param>
 		<name>Type</name>
 		<key>type</key>
@@ -40,8 +43,8 @@
 		</option>
 	</param>
 	<param>
-		<name>Block Size</name>
-		<key>block_size</key>
+		<name>Interleaver Size</name>
+		<key>interleaver_size</key>
 		<type>int</type>
 	</param>
 	<param>
@@ -71,4 +74,8 @@
 		<type>$type</type>
 		<vlen>$vlen</vlen>
 	</source>
+        <doc>
+Interleaver size is given in blocks. 
+One Symbol = (in/out type) * (vector length) 
+        </doc>
 </block>
diff --git a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
new file mode 100644
index 000000000..81d800902
--- /dev/null
+++ b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## SCCC Decoder Combined
+###################################################
+ -->
+
+
+<block>
+	<name>SCCC Decoder Combo</name>
+	<key>trellis_sccc_decoder_combined_xx</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.sccc_decoder_combined_$(type)$(out_type)(
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
+		trellis.interleaver($interleaver), 
+		$block_size,
+		$iterations,
+                $siso_type,
+		$dim, $table, $metric_type,
+		$scaling)
+	</make>
+        <callback>set_TABLE($table)</callback>
+	<param>
+		<name>Input Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>c</key>
+			<opt>io:complex</opt>
+			<opt>table:complex_vector</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>f</key>
+			<opt>io:float</opt>
+			<opt>table:real_vector</opt>
+		</option>
+	</param>
+	<param>
+		<name>Output Type</name>
+		<key>out_type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>i</key>
+			<opt>io:int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>s</key>
+			<opt>io:short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>b</key>
+			<opt>io:byte</opt>
+		</option>
+	</param>
+	<param>
+		<name>Outer FSM</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Outer Initial State</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Outer Final State</name>
+		<key>o_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Inner FSM</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Inner Initial State</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Inner Final State</name>
+		<key>i_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Block Size</name>
+		<key>block_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Iterations</name>
+		<key>iterations</key>
+		<value>10</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Dimensionality</name>
+		<key>dim</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Constellation</name>
+		<key>table</key>
+		<type>$type.table</type>
+	</param>
+	<param>
+		<name>Metric Type</name>
+		<key>metric_type</key>
+		<type>enum</type>
+		<option>
+			<name>Euclidean</name>
+			<key>trellis.TRELLIS_EUCLIDEAN</key>
+		</option>
+		<option>
+			<name>Hard Symbol</name>
+			<key>trellis.TRELLIS_HARD_SYMBOL</key>
+		</option>
+		<option>
+			<name>Hard Bit</name>
+			<key>trellis.TRELLIS_HARD_BIT</key>
+		</option>
+	</param>
+	<param>
+		<name>SISO Type</name>
+		<key>siso_type</key>
+		<type>enum</type>
+		<option>
+			<name>Min Sum</name>
+			<key>trellis.TRELLIS_MIN_SUM</key>
+		</option>
+		<option>
+			<name>Sum Product</name>
+			<key>trellis.TRELLIS_SUM_PRODUCT</key>
+		</option>
+	</param>
+	<param>
+		<name>Scaling</name>
+		<key>scaling</key>
+		<value>1.0</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type.io</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$out_type.io</type>
+	</source>
+	<doc>
+SCCC turbo Decoder combined with metric calculation.
+The fsm arguments are passed directly to the trellis.fsm() constructor.
+	</doc>
+</block>
diff --git a/gr-trellis/grc/trellis_sccc_decoder_x.xml b/gr-trellis/grc/trellis_sccc_decoder_x.xml
new file mode 100644
index 000000000..9fc24927b
--- /dev/null
+++ b/gr-trellis/grc/trellis_sccc_decoder_x.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## SCCC Decoder 
+###################################################
+ -->
+
+
+<block>
+	<name>SCCC Decoder</name>
+	<key>trellis_sccc_decoder_x</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.sccc_decoder_$(out_type)(
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
+		trellis.interleaver($interleaver), 
+		$block_size,
+		$iterations,
+                $siso_type)
+	</make>
+	<param>
+		<name>Output Type</name>
+		<key>out_type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>i</key>
+			<opt>io:int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>s</key>
+			<opt>io:short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>b</key>
+			<opt>io:byte</opt>
+		</option>
+	</param>
+	<param>
+		<name>Outer FSM</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Outer Initial State</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Outer Final State</name>
+		<key>o_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Inner FSM</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Inner Initial State</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Inner Final State</name>
+		<key>i_final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Block Size</name>
+		<key>block_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Iterations</name>
+		<key>iterations</key>
+		<value>10</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>SISO Type</name>
+		<key>siso_type</key>
+		<type>enum</type>
+		<option>
+			<name>Min Sum</name>
+			<key>trellis.TRELLIS_MIN_SUM</key>
+		</option>
+		<option>
+			<name>Sum Product</name>
+			<key>trellis.TRELLIS_SUM_PRODUCT</key>
+		</option>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$out_type.io</type>
+	</source>
+	<doc>
+SCCC turbo Decoder.
+The fsm and interleaver arguments are passed directly to the trellis.fsm() and trellis.interleaver() constructors.
+	</doc>
+</block>
diff --git a/gr-trellis/grc/trellis_sccc_encoder_xx.xml b/gr-trellis/grc/trellis_sccc_encoder_xx.xml
new file mode 100644
index 000000000..54d9c1e01
--- /dev/null
+++ b/gr-trellis/grc/trellis_sccc_encoder_xx.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##SCCC Encoder
+###################################################
+ -->
+
+<block>
+	<name>SCCC Encoder</name>
+	<key>trellis_sccc_encoder_xx</key>
+	<category>Error Correction/Trellis</category>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.sccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state, trellis.fsm($i_fsm_args), $i_init_state, trellis.interleaver($interleaver_args), $bl)</make>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Byte->Byte</name>
+			<key>bb</key>
+			<opt>input:byte</opt>
+			<opt>output:byte</opt>
+		</option>
+		<option>
+			<name>Byte->Short</name>
+			<key>bs</key>
+			<opt>input:byte</opt>
+			<opt>output:short</opt>
+		</option>
+		<option>
+			<name>Byte->Int</name>
+			<key>bi</key>
+			<opt>input:byte</opt>
+			<opt>output:int</opt>
+		</option>
+		<option>
+			<name>Short->Short</name>
+			<key>ss</key>
+			<opt>input:short</opt>
+			<opt>output:short</opt>
+		</option>
+		<option>
+			<name>Short->Int</name>
+			<key>si</key>
+			<opt>input:short</opt>
+			<opt>output:int</opt>
+		</option>
+		<option>
+			<name>Int->Int</name>
+			<key>ii</key>
+			<opt>input:int</opt>
+			<opt>output:int</opt>
+		</option>
+	</param>
+	<param>
+		<name>Outer FSM</name>
+		<key>o_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Outer Initial State</name>
+		<key>o_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Inner FSM</name>
+		<key>i_fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Inner Initial State</name>
+		<key>i_init_state</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Interleaver</name>
+		<key>interleaver_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Blocklength</name>
+		<key>bl</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type.input</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type.output</type>
+	</source>
+	<doc>
+The fsm and interleaver arguments are passed directly to the trellis.fsm() and trellis.interleaver() constructors.
+	</doc>
+</block>
diff --git a/grc/blocks/trellis_siso_combined_f.xml b/gr-trellis/grc/trellis_siso_combined_f.xml
index 98874d7f4..a39986a86 100644
--- a/grc/blocks/trellis_siso_combined_f.xml
+++ b/gr-trellis/grc/trellis_siso_combined_f.xml
@@ -4,9 +4,12 @@
 ##Trellis SISO Combined
 ###################################################
  -->
+
+
 <block>
-	<name>Trellis SISO Combo</name>
+	<name>SISO Combo</name>
 	<key>trellis_siso_combined_f</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.siso_combined_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type, $dim, $table, $metric_type)</make>
 	<param>
@@ -22,7 +25,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
-		<value>-1</value>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<param>
diff --git a/grc/blocks/trellis_siso_f.xml b/gr-trellis/grc/trellis_siso_f.xml
index 2b9cfe5f7..e3fb502b3 100644
--- a/grc/blocks/trellis_siso_f.xml
+++ b/gr-trellis/grc/trellis_siso_f.xml
@@ -4,9 +4,12 @@
 ##Trellis SISO
 ###################################################
  -->
+
+
 <block>
-	<name>Trellis SISO</name>
+	<name>SISO</name>
 	<key>trellis_siso_f</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.siso_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type)</make>
 	<param>
@@ -22,7 +25,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
-		<value>-1</value>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<param>
diff --git a/grc/blocks/trellis_viterbi_combined_xx.xml b/gr-trellis/grc/trellis_viterbi_combined_xx.xml
index 33dcaaf73..200f07859 100644
--- a/grc/blocks/trellis_viterbi_combined_xx.xml
+++ b/gr-trellis/grc/trellis_viterbi_combined_xx.xml
@@ -4,9 +4,12 @@
 ##Trellis Viterbi Combined
 ###################################################
  -->
+
+
 <block>
-	<name>Trellis Viterbi Combo</name>
+	<name>Viterbi Combo</name>
 	<key>trellis_viterbi_combined_xx</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.viterbi_combined_$(type)$(out_type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $dim, $table, $metric_type)</make>
         <callback>set_TABLE($table)</callback>
@@ -72,7 +75,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
-		<value>-1</value>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<param>
diff --git a/grc/blocks/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml
index 84b39677c..d97e6707a 100644
--- a/grc/blocks/trellis_viterbi_x.xml
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -4,9 +4,12 @@
 ##Trellis Viterbi
 ###################################################
  -->
+
+
 <block>
-	<name>Trellis Viterbi</name>
+	<name>Viterbi</name>
 	<key>trellis_viterbi_x</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)</make>
 	<param>
@@ -42,7 +45,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
-		<value>-1</value>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<param>
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index ae7f21f56..8f703c92a 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -40,12 +40,12 @@ core_generator = 				\
 	trellis_encoder_XX.cc.t			\
 	trellis_encoder_XX.h.t			\
 	trellis_encoder_XX.i.t			\
-	trellis_sccc_encoder_XX.cc.t			\
-	trellis_sccc_encoder_XX.h.t			\
-	trellis_sccc_encoder_XX.i.t			\
-	trellis_pccc_encoder_XX.cc.t			\
-	trellis_pccc_encoder_XX.h.t			\
-	trellis_pccc_encoder_XX.i.t			\
+	trellis_sccc_encoder_XX.cc.t		\
+	trellis_sccc_encoder_XX.h.t		\
+	trellis_sccc_encoder_XX.i.t		\
+	trellis_pccc_encoder_XX.cc.t		\
+	trellis_pccc_encoder_XX.h.t		\
+	trellis_pccc_encoder_XX.i.t		\
 	trellis_metrics_X.cc.t			\
 	trellis_metrics_X.h.t			\
 	trellis_metrics_X.i.t			\
@@ -53,14 +53,17 @@ core_generator = 				\
 	trellis_viterbi_combined_XX.h.t		\
 	trellis_viterbi_combined_XX.i.t		\
 	trellis_sccc_decoder_combined_XX.cc.t	\
-	trellis_sccc_decoder_combined_XX.h.t		\
-	trellis_sccc_decoder_combined_XX.i.t		\
-	trellis_sccc_decoder_X.cc.t	\
+	trellis_sccc_decoder_combined_XX.h.t	\
+	trellis_sccc_decoder_combined_XX.i.t	\
+	trellis_sccc_decoder_X.cc.t		\
 	trellis_sccc_decoder_X.h.t		\
 	trellis_sccc_decoder_X.i.t		\
-	trellis_pccc_decoder_X.cc.t	\
+	trellis_pccc_decoder_X.cc.t		\
 	trellis_pccc_decoder_X.h.t		\
 	trellis_pccc_decoder_X.i.t		\
+	trellis_pccc_decoder_combined_XX.cc.t	\
+	trellis_pccc_decoder_combined_XX.h.t	\
+	trellis_pccc_decoder_combined_XX.i.t	\
 	trellis_viterbi_X.cc.t			\
 	trellis_viterbi_X.h.t			\
 	trellis_viterbi_X.i.t
diff --git a/gr-trellis/src/lib/Makefile.gen b/gr-trellis/src/lib/Makefile.gen
index 534a7466e..b9b9afb1f 100644
--- a/gr-trellis/src/lib/Makefile.gen
+++ b/gr-trellis/src/lib/Makefile.gen
@@ -13,6 +13,12 @@ GENERATED_H = \
 	trellis_metrics_i.h \
 	trellis_metrics_s.h \
 	trellis_pccc_decoder_b.h \
+	trellis_pccc_decoder_combined_cb.h \
+	trellis_pccc_decoder_combined_ci.h \
+	trellis_pccc_decoder_combined_cs.h \
+	trellis_pccc_decoder_combined_fb.h \
+	trellis_pccc_decoder_combined_fi.h \
+	trellis_pccc_decoder_combined_fs.h \
 	trellis_pccc_decoder_i.h \
 	trellis_pccc_decoder_s.h \
 	trellis_pccc_encoder_bb.h \
@@ -64,6 +70,12 @@ GENERATED_I = \
 	trellis_metrics_i.i \
 	trellis_metrics_s.i \
 	trellis_pccc_decoder_b.i \
+	trellis_pccc_decoder_combined_cb.i \
+	trellis_pccc_decoder_combined_ci.i \
+	trellis_pccc_decoder_combined_cs.i \
+	trellis_pccc_decoder_combined_fb.i \
+	trellis_pccc_decoder_combined_fi.i \
+	trellis_pccc_decoder_combined_fs.i \
 	trellis_pccc_decoder_i.i \
 	trellis_pccc_decoder_s.i \
 	trellis_pccc_encoder_bb.i \
@@ -115,6 +127,12 @@ GENERATED_CC = \
 	trellis_metrics_i.cc \
 	trellis_metrics_s.cc \
 	trellis_pccc_decoder_b.cc \
+	trellis_pccc_decoder_combined_cb.cc \
+	trellis_pccc_decoder_combined_ci.cc \
+	trellis_pccc_decoder_combined_cs.cc \
+	trellis_pccc_decoder_combined_fb.cc \
+	trellis_pccc_decoder_combined_fi.cc \
+	trellis_pccc_decoder_combined_fs.cc \
 	trellis_pccc_decoder_i.cc \
 	trellis_pccc_decoder_s.cc \
 	trellis_pccc_encoder_bb.cc \
diff --git a/gr-trellis/src/lib/core_algorithms.cc b/gr-trellis/src/lib/core_algorithms.cc
index 91ac8fbdf..54193c818 100644
--- a/gr-trellis/src/lib/core_algorithms.cc
+++ b/gr-trellis/src/lib/core_algorithms.cc
@@ -784,7 +784,7 @@ template<class Ti, class To>
 void sccc_decoder_combined(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<Ti> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -810,7 +810,7 @@ for(int k=0;k<blocklength;k++) {
   iprioro[k*FSMi.O()] *= scaling;
 }
 
-for(int rep=0;rep<repetitions;rep++) {
+for(int rep=0;rep<iterations;rep++) {
   // run inner SISO
   siso_algorithm(FSMi.I(),FSMi.S(),FSMi.O(),
              FSMi.NS(), FSMi.OS(), FSMi.PS(), FSMi.PI(),
@@ -832,7 +832,7 @@ for(int rep=0;rep<repetitions;rep++) {
 
   // run outer SISO
 
-  if(rep<repetitions-1) { // do not produce posti
+  if(rep<iterations-1) { // do not produce posti
     siso_algorithm(FSMo.I(),FSMo.S(),FSMo.O(),
              FSMo.NS(), FSMo.OS(), FSMo.PS(), FSMo.PI(),
              blocklength,
@@ -897,7 +897,7 @@ template
 void sccc_decoder_combined<float,unsigned char>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<float> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -909,7 +909,7 @@ template
 void sccc_decoder_combined<float,short>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<float> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -921,7 +921,7 @@ template
 void sccc_decoder_combined<float,int>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<float> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -933,7 +933,7 @@ template
 void sccc_decoder_combined<gr_complex,unsigned char>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<gr_complex> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -945,7 +945,7 @@ template
 void sccc_decoder_combined<gr_complex,short>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<gr_complex> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -957,7 +957,7 @@ template
 void sccc_decoder_combined<gr_complex,int>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<gr_complex> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -973,7 +973,7 @@ template<class T>
 void sccc_decoder(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *iprioro, T *data
 )
@@ -988,7 +988,7 @@ void sccc_decoder(
   std::vector<float> oposti(blocklength*FSMo.I());
   std::vector<float> oposto(blocklength*FSMo.O());
 
-  for(int rep=0;rep<repetitions;rep++) {
+  for(int rep=0;rep<iterations;rep++) {
     // run inner SISO
     siso_algorithm(FSMi.I(),FSMi.S(),FSMi.O(),
              FSMi.NS(), FSMi.OS(), FSMi.PS(), FSMi.PI(),
@@ -1010,7 +1010,7 @@ void sccc_decoder(
 
     // run outer SISO
 
-    if(rep<repetitions-1) { // do not produce posti
+    if(rep<iterations-1) { // do not produce posti
       siso_algorithm(FSMo.I(),FSMo.S(),FSMo.O(),
              FSMo.NS(), FSMo.OS(), FSMo.PS(), FSMo.PI(),
              blocklength,
@@ -1050,7 +1050,7 @@ void sccc_decoder(
       */
     }
 
-  } // end repetitions
+  } // end iterations
 
   // generate hard decisions
   for(int k=0;k<blocklength;k++) {
@@ -1075,7 +1075,7 @@ template
 void sccc_decoder<unsigned char>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *iprioro, unsigned char *data
 );
@@ -1084,7 +1084,7 @@ template
 void sccc_decoder<short>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *iprioro, short *data
 );
@@ -1093,7 +1093,7 @@ template
 void sccc_decoder<int>(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *iprioro, int *data
 );
@@ -1105,7 +1105,7 @@ template<class T>
 void pccc_decoder(
       const fsm &FSM1, int ST10, int ST1K,
       const fsm &FSM2, int ST20, int ST2K,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *cprioro, T *data
 )
@@ -1140,7 +1140,7 @@ void pccc_decoder(
     }
   }
 
-  for(int rep=0;rep<repetitions;rep++) {
+  for(int rep=0;rep<iterations;rep++) {
     // run  SISO 1
     siso_algorithm(FSM1.I(),FSM1.S(),FSM1.O(),
              FSM1.NS(), FSM1.OS(), FSM1.PS(), FSM1.PI(),
@@ -1185,7 +1185,7 @@ void pccc_decoder(
       memcpy(&(priori1[ki*FSM1.I()]),&(posti2[k*FSM2.I()]),FSM1.I()*sizeof(float));
     }
 
-  } // end repetitions
+  } // end iterations
 
   // generate hard decisions
   for(int k=0;k<blocklength;k++) {
@@ -1204,8 +1204,6 @@ void pccc_decoder(
   }
   //std::cout << std::endl;
 
-
-
 }
 
 //----------------
@@ -1214,7 +1212,7 @@ template
 void pccc_decoder<unsigned char>(
       const fsm &FSM1, int ST10, int ST1K,
       const fsm &FSM2, int ST20, int ST2K,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *cprioro, unsigned char *data
 );
@@ -1223,7 +1221,7 @@ template
 void pccc_decoder<short>(
       const fsm &FSM1, int ST10, int ST1K,
       const fsm &FSM2, int ST20, int ST2K,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *cprioro, short *data
 );
@@ -1232,8 +1230,208 @@ template
 void pccc_decoder<int>(
       const fsm &FSM1, int ST10, int ST1K,
       const fsm &FSM2, int ST20, int ST2K,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       const float *cprioro, int *data
 );
 
+
+
+//----------------
+
+
+template<class Ti, class To>
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<Ti> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const Ti *observations, To *data
+)
+{
+
+  //allocate space for cprioro
+  std::vector<float> cprioro(blocklength*FSM1.O()*FSM2.O(),0.0);
+
+  //allocate space for priori, prioro and posti of FSM1
+  std::vector<float> priori1(blocklength*FSM1.I(),0.0);
+  std::vector<float> prioro1(blocklength*FSM1.O());
+  std::vector<float> posti1(blocklength*FSM1.I());
+
+  //allocate space for priori, prioro and posti of FSM2
+  std::vector<float> priori2(blocklength*FSM2.I(),0.0);
+  std::vector<float> prioro2(blocklength*FSM2.O());
+  std::vector<float> posti2(blocklength*FSM2.I());
+
+  // turn observations to neg-log-priors for cprioiro
+  int O=FSM1.O()*FSM2.O();
+  for(int k=0;k<blocklength;k++) {
+    calc_metric(O, D, TABLE, &(observations[k*D]), &(cprioro[k*O]),METRIC_TYPE);
+    cprioro[k*O] *= scaling;
+  }
+ 
+  //generate prioro1,2 (metrics are not updated per iteration: this is not the best you can do...)
+  for (int k=0;k<blocklength;k++) {
+    //std::cout << k << std::endl;
+    for(int i=0;i<FSM1.O();i++) {
+      float x=cprioro[k*FSM1.O()*FSM2.O()+i*FSM1.O()+0];
+      for(int j=1;j<FSM2.O();j++)
+        x = (*p2mymin)(x,cprioro[k*FSM1.O()*FSM2.O()+i*FSM1.O()+j]);
+      prioro1[k*FSM1.O()+i]=x;
+      //std::cout <<  prioro1[k*FSM1.O()+i] << ", ";
+    }
+    //std::cout << std::endl;
+    for(int i=0;i<FSM2.O();i++) {
+      float x=cprioro[k*FSM1.O()*FSM2.O()+0*FSM1.O()+i];
+      for(int j=1;j<FSM1.O();j++)
+        x = (*p2mymin)(x,cprioro[k*FSM1.O()*FSM2.O()+j*FSM1.O()+i]);
+      prioro2[k*FSM2.O()+i]=x;
+    }
+  }
+
+  for(int rep=0;rep<iterations;rep++) {
+    // run  SISO 1
+    siso_algorithm(FSM1.I(),FSM1.S(),FSM1.O(),
+             FSM1.NS(), FSM1.OS(), FSM1.PS(), FSM1.PI(),
+             blocklength,
+             ST10,ST1K,
+             true, false,
+             p2mymin,
+             &(priori1[0]),  &(prioro1[0]), &(posti1[0])
+    );
+   
+    //for(int k=0;k<blocklength;k++){
+      //for(int i=0;i<FSM1.I();i++)
+        //std::cout << posti1[k*FSM1.I()+i] << ", ";
+      //std::cout << std::endl;
+    //}
+
+    //interleave soft info 1 -> 2
+    for(int k=0;k<blocklength;k++) {
+      int ki = INTERLEAVER.INTER()[k];
+      //for(int i=0;i<FSMi.I();i++) {
+        //oprioro[k*FSMi.I()+i]=iposti[ki*FSMi.I()+i];
+      //}
+      memcpy(&(priori2[k*FSM2.I()]),&(posti1[ki*FSM1.I()]),FSM1.I()*sizeof(float));
+    } 
+
+    // run SISO 2
+    siso_algorithm(FSM2.I(),FSM2.S(),FSM2.O(),
+           FSM2.NS(), FSM2.OS(), FSM2.PS(), FSM2.PI(),
+           blocklength,
+           ST20,ST2K,
+           true, false,
+           p2mymin,
+           &(priori2[0]),  &(prioro2[0]), &(posti2[0])
+    );
+
+    //interleave soft info 2 --> 1
+    for(int k=0;k<blocklength;k++) {
+      int ki = INTERLEAVER.INTER()[k];
+      //for(int i=0;i<FSMi.I();i++) {
+        //ipriori[ki*FSMi.I()+i]=oposto[k*FSMi.I()+i];
+      //}
+      memcpy(&(priori1[ki*FSM1.I()]),&(posti2[k*FSM2.I()]),FSM1.I()*sizeof(float));
+    }
+
+  } // end iterations
+
+  // generate hard decisions
+  for(int k=0;k<blocklength;k++) {
+    for(int i=0;i<FSM1.I();i++)
+      posti1[k*FSM1.I()+i]  = (*p2mymin)(priori1[k*FSM1.I()+i],posti1[k*FSM1.I()+i]);
+    float min=INF;
+    int mini=0;
+    for(int i=0;i<FSM1.I();i++) {
+      if(posti1[k*FSM1.I()+i]<min) {
+        min=posti1[k*FSM1.I()+i];
+        mini=i;
+      }
+    }
+    data[k]=(To)mini;
+    //std::cout << data[k] << ", "<< std::endl;
+  }
+  //std::cout << std::endl;
+
+}
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<float> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const float *observations, unsigned char *data
+);
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<float> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const float *observations, short *data
+);
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<float> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const float *observations, int *data
+);
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<gr_complex> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const gr_complex *observations, unsigned char *data
+);
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<gr_complex> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const gr_complex *observations, short *data
+);
+
+
+template
+void pccc_decoder_combined(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      int D, const std::vector<gr_complex> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const gr_complex *observations, int *data
+);
diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h
index fdb5f398e..0ce4f3f4e 100644
--- a/gr-trellis/src/lib/core_algorithms.h
+++ b/gr-trellis/src/lib/core_algorithms.h
@@ -91,11 +91,21 @@ void siso_algorithm_combined(int I, int S, int O,
 );
 
 
+template<class T>
+void sccc_decoder(
+      const fsm &FSMo, int STo0, int SToK,
+      const fsm &FSMi, int STi0, int STiK,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
+      float (*p2mymin)(float,float),
+      const float *iprioro, T *data
+);
+ 
+
 template<class Ti, class To>
 void sccc_decoder_combined(
       const fsm &FSMo, int STo0, int SToK,
       const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
       int D, const std::vector<Ti> &TABLE,
       trellis_metric_type_t METRIC_TYPE,
@@ -103,26 +113,28 @@ void sccc_decoder_combined(
       const Ti *observations, To *data
 );
 
-
 template<class T>
-void sccc_decoder(
-      const fsm &FSMo, int STo0, int SToK,
-      const fsm &FSMi, int STi0, int STiK,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+void pccc_decoder(
+      const fsm &FSM1, int ST10, int ST1K,
+      const fsm &FSM2, int ST20, int ST2K,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
-      const float *iprioro, T *data
+      const float *cprioro, T *data
 );
 
-
-template<class T>
-void pccc_decoder(
+template<class Ti, class To>
+void pccc_decoder_combined(
       const fsm &FSM1, int ST10, int ST1K,
       const fsm &FSM2, int ST20, int ST2K,
-      const interleaver &INTERLEAVER, int blocklength, int repetitions,
+      const interleaver &INTERLEAVER, int blocklength, int iterations,
       float (*p2mymin)(float,float),
-      const float *cprioro, T *data
+      int D, const std::vector<Ti> &TABLE,
+      trellis_metric_type_t METRIC_TYPE,
+      float scaling,
+      const Ti *observations, To *data
 );
 
 
 
+
 #endif
diff --git a/gr-trellis/src/lib/generate_trellis.py b/gr-trellis/src/lib/generate_trellis.py
index 9f845f74a..31bc44aac 100644
--- a/gr-trellis/src/lib/generate_trellis.py
+++ b/gr-trellis/src/lib/generate_trellis.py
@@ -33,9 +33,10 @@ other_roots = [
     'trellis_metrics_X',
     'trellis_viterbi_X',
     'trellis_viterbi_combined_XX',
-    'trellis_sccc_decoder_combined_XX',
     'trellis_sccc_decoder_X',
+    'trellis_sccc_decoder_combined_XX',
     'trellis_pccc_decoder_X',
+    'trellis_pccc_decoder_combined_XX',
     ]
 
 other_signatures = (
@@ -45,9 +46,10 @@ other_signatures = (
     ['s','i','f','c'],
     ['b','s','i'],
     ['sb','ss','si','ib','is','ii','fb','fs','fi','cb','cs','ci'],
-    ['fb','fs','fi','cb','cs','ci'],
     ['b','s','i'],
+    ['fb','fs','fi','cb','cs','ci'],
     ['b','s','i'],
+    ['fb','fs','fi','cb','cs','ci'],
     )
 
 
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.cc.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.cc.t
new file mode 100644
index 000000000..48f68f1fe
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.cc.t
@@ -0,0 +1,147 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <@NAME@.h>
+#include <gr_io_signature.h>
+#include <assert.h>
+#include <iostream>
+#include "core_algorithms.h"
+
+  
+static const float INF = 1.0e9;
+
+@SPTR_NAME@ 
+trellis_make_@BASE_NAME@ (
+  const fsm &FSMo, int STo0, int SToK,
+  const fsm &FSMi, int STi0, int STiK,
+  const interleaver &INTERLEAVER,
+  int blocklength,
+  int repetitions,
+  trellis_siso_type_t SISO_TYPE,
+  int D,
+  const std::vector<@I_TYPE@> &TABLE,
+  trellis_metric_type_t METRIC_TYPE,
+  float scaling
+)
+{
+  return gnuradio::get_initial_sptr (new @NAME@ (
+    FSMo, STo0, SToK,
+    FSMi, STi0, STiK,
+    INTERLEAVER,
+    blocklength,
+    repetitions,
+    SISO_TYPE,
+    D,
+    TABLE,METRIC_TYPE,
+    scaling
+    ));
+}
+
+@NAME@::@NAME@ (
+  const fsm &FSMo, int STo0, int SToK,
+  const fsm &FSMi, int STi0, int STiK,
+  const interleaver &INTERLEAVER,
+  int blocklength,
+  int repetitions,
+  trellis_siso_type_t SISO_TYPE,
+  int D,
+  const std::vector<@I_TYPE@> &TABLE,
+  trellis_metric_type_t METRIC_TYPE,
+  float scaling
+)
+  : gr_block ("@BASE_NAME@",
+			  gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
+			  gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),  
+  d_FSMo (FSMo), d_STo0 (STo0), d_SToK (SToK),
+  d_FSMi (FSMi), d_STi0 (STi0), d_STiK (STiK),
+  d_INTERLEAVER (INTERLEAVER),
+  d_blocklength (blocklength),
+  d_repetitions (repetitions),
+  d_SISO_TYPE (SISO_TYPE),
+  d_D (D),
+  d_TABLE (TABLE),
+  d_METRIC_TYPE (METRIC_TYPE),
+  d_scaling (scaling)
+{
+    assert(d_FSMo.I() == d_FSMi.I());
+    set_relative_rate (1.0 / ((double) d_D));
+    set_output_multiple (d_blocklength);
+}
+
+void @NAME@::set_scaling(float scaling)
+{
+  d_scaling = scaling;
+}
+
+
+void
+@NAME@::forecast (int noutput_items, gr_vector_int &ninput_items_required)
+{
+  assert (noutput_items % d_blocklength == 0);
+  int input_required =  d_D * noutput_items ;
+  ninput_items_required[0] = input_required;
+}
+
+
+
+//===========================================================
+
+int
+@NAME@::general_work (int noutput_items,
+                        gr_vector_int &ninput_items,
+                        gr_vector_const_void_star &input_items,
+                        gr_vector_void_star &output_items)
+{
+  assert (noutput_items % d_blocklength == 0);
+  int nblocks = noutput_items / d_blocklength;
+
+  float (*p2min)(float, float) = NULL;
+  if(d_SISO_TYPE == TRELLIS_MIN_SUM)
+    p2min = &min;
+  else if(d_SISO_TYPE == TRELLIS_SUM_PRODUCT)
+    p2min = &min_star;
+
+
+  const @I_TYPE@ *in = (const @I_TYPE@ *) input_items[0];
+  @O_TYPE@ *out = (@O_TYPE@ *) output_items[0];
+  for (int n=0;n<nblocks;n++) {
+    pccc_decoder_combined(
+      d_FSMo, d_STo0, d_SToK,
+      d_FSMi, d_STi0, d_STiK,
+      d_INTERLEAVER, d_blocklength, d_repetitions,
+      p2min, 
+      d_D,d_TABLE, 
+      d_METRIC_TYPE, 
+      d_scaling,
+      &(in[n*d_blocklength*d_D]),&(out[n*d_blocklength])
+    );
+  }
+
+  consume_each (d_D * noutput_items );
+  return noutput_items;
+}
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
new file mode 100644
index 000000000..dd9979af9
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
@@ -0,0 +1,124 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include "fsm.h"
+#include "interleaver.h"
+#include <gr_block.h>
+#include <vector>
+#include "calc_metric.h"
+#include "siso_type.h"
+
+class @NAME@;
+typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
+
+@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  const fsm &FSMo, int STo0, int SToK,
+  const fsm &FSMi, int STi0, int STiK,
+  const interleaver &INTERLEAVER,
+  int blocklength,
+  int repetitions,
+  trellis_siso_type_t SISO_TYPE, // perform "min-sum" or "sum-product" combining 
+  int D,
+  const std::vector<@I_TYPE@> &TABLE,
+  trellis_metric_type_t METRIC_TYPE,
+  float scaling
+);
+
+
+/*!
+ *  \ingroup coding_blk
+ */
+class @NAME@ : public gr_block
+{
+  fsm d_FSMo;
+  fsm d_FSMi;
+  int d_STo0;
+  int d_SToK;
+  int d_STi0;
+  int d_STiK;
+  interleaver d_INTERLEAVER;
+  int d_blocklength;
+  int d_repetitions;
+  trellis_siso_type_t d_SISO_TYPE;
+  int d_D;
+  std::vector<@I_TYPE@> d_TABLE;
+  trellis_metric_type_t d_METRIC_TYPE;
+  float d_scaling;
+  std::vector<float> d_buffer;
+
+  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+    const fsm &FSMo, int STo0, int SToK,
+    const fsm &FSMi, int STi0, int STiK,
+    const interleaver &INTERLEAVER,
+    int blocklength,
+    int repetitions,
+    trellis_siso_type_t SISO_TYPE,
+    int D,
+    const std::vector<@I_TYPE@> &TABLE,
+    trellis_metric_type_t METRIC_TYPE,
+    float scaling
+  );
+
+  @NAME@ (
+    const fsm &FSMo, int STo0, int SToK,
+    const fsm &FSMi, int STi0, int STiK,
+    const interleaver &INTERLEAVER,
+    int blocklength,
+    int repetitions,
+    trellis_siso_type_t SISO_TYPE, 
+    int D,
+    const std::vector<@I_TYPE@> &TABLE,
+    trellis_metric_type_t METRIC_TYPE,
+    float scaling
+  );
+
+public:
+  fsm FSM1 () const { return d_FSMo; }
+  fsm FSM2 () const { return d_FSMi; }
+  int ST10 () const { return d_STo0; }
+  int ST1K () const { return d_SToK; }
+  int ST20 () const { return d_STi0; }
+  int ST2K () const { return d_STiK; }
+  interleaver INTERLEAVER () const { return d_INTERLEAVER; }
+  int blocklength () const { return d_blocklength; }
+  int repetitions () const { return d_repetitions; }
+  int D () const { return d_D; }
+  std::vector<@I_TYPE@> TABLE () const { return d_TABLE; }
+  trellis_metric_type_t METRIC_TYPE () const { return d_METRIC_TYPE; }
+  trellis_siso_type_t SISO_TYPE () const { return d_SISO_TYPE; }
+  float scaling () const { return d_scaling; }
+  void set_scaling (float scaling);
+
+  void forecast (int noutput_items,
+                 gr_vector_int &ninput_items_required);
+  int general_work (int noutput_items,
+                    gr_vector_int &ninput_items,
+                    gr_vector_const_void_star &input_items,
+                    gr_vector_void_star &output_items);
+};
+
+#endif
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.i.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.i.t
new file mode 100644
index 000000000..d841f67b4
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.i.t
@@ -0,0 +1,73 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// @WARNING@
+
+GR_SWIG_BLOCK_MAGIC(trellis,@BASE_NAME@);
+
+@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  const fsm &FSMo, int STo0, int SToK,
+  const fsm &FSMi, int STi0, int STiK,
+  const interleaver &INTERLEAVER,
+  int blocklength,
+  int repetitions,
+  trellis_siso_type_t SISO_TYPE,
+  int D,
+  const std::vector<@I_TYPE@> &TABLE,
+  trellis_metric_type_t METRIC_TYPE,
+  float scaling
+);
+
+
+class @NAME@ : public gr_block
+{
+private:
+  @NAME@ (
+    const fsm &FSMo, int STo0, int SToK,
+    const fsm &FSMi, int STi0, int STiK,
+    const interleaver &INTERLEAVER,
+    int blocklength,
+    int repetitions,
+    trellis_siso_type_t SISO_TYPE,
+    int D,
+    const std::vector<@I_TYPE@> &TABLE,
+    trellis_metric_type_t METRIC_TYPE,
+    float scaling
+  );
+
+public:
+  fsm FSM1 () const { return d_FSMo; }
+  fsm FSM2 () const { return d_FSMi; }
+  int ST10 () const { return d_STo0; }
+  int ST1K () const { return d_SToK; }
+  int ST20 () const { return d_STi0; }
+  int ST2K () const { return d_STiK; }
+  interleaver INTERLEAVER () const { return d_INTERLEAVER; }
+  int blocklength () const { return d_blocklength; }
+  int repetitions () const { return d_repetitions; }
+  int D () const { return d_D; }
+  std::vector<@I_TYPE@> TABLE () const { return d_TABLE; }
+  trellis_metric_type_t METRIC_TYPE () const { return d_METRIC_TYPE; }
+  trellis_siso_type_t SISO_TYPE () const { return d_SISO_TYPE; }
+  float scaling() const { return d_scaling; }
+  void set_scaling (float scaling);
+};
diff --git a/gr-trellis/src/lib/trellis_permutation.cc b/gr-trellis/src/lib/trellis_permutation.cc
index a32390742..416fc58ec 100644
--- a/gr-trellis/src/lib/trellis_permutation.cc
+++ b/gr-trellis/src/lib/trellis_permutation.cc
@@ -30,19 +30,19 @@
 #include <string.h>
 
 trellis_permutation_sptr 
-trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT)
+trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL)
 {
-  return gnuradio::get_initial_sptr(new trellis_permutation (K,TABLE,SYMS_PER_BLOCK,NBYTES_INOUT));
+  return gnuradio::get_initial_sptr(new trellis_permutation (K,TABLE,SYMS_PER_BLOCK,BYTES_PER_SYMBOL));
 }
 
-trellis_permutation::trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT)
+trellis_permutation::trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL)
   : gr_sync_block ("permutation",
-		   gr_make_io_signature (1, -1, NBYTES_INOUT),
-		   gr_make_io_signature (1, -1, NBYTES_INOUT)),
+		   gr_make_io_signature (1, -1, BYTES_PER_SYMBOL),
+		   gr_make_io_signature (1, -1, BYTES_PER_SYMBOL)),
     d_K (K),
     d_TABLE (TABLE),
     d_SYMS_PER_BLOCK (SYMS_PER_BLOCK),
-    d_NBYTES_INOUT (NBYTES_INOUT)
+    d_BYTES_PER_SYMBOL (BYTES_PER_SYMBOL)
 {
     set_output_multiple (d_K*SYMS_PER_BLOCK);
     //std::cout << d_K << "\n";
@@ -72,9 +72,9 @@ trellis_permutation::work (int noutput_items,
       int j0 = i%d_K;
       // new position of block within packet (in blocks)
       int k0 = d_TABLE[j0];
-      memcpy(&(out[i*d_SYMS_PER_BLOCK*d_NBYTES_INOUT]), 
-             &(in[(i0+k0)*d_SYMS_PER_BLOCK*d_NBYTES_INOUT]), 
-             d_NBYTES_INOUT*d_SYMS_PER_BLOCK);
+      memcpy(&(out[i*d_SYMS_PER_BLOCK*d_BYTES_PER_SYMBOL]), 
+             &(in[(i0+k0)*d_SYMS_PER_BLOCK*d_BYTES_PER_SYMBOL]), 
+             d_BYTES_PER_SYMBOL*d_SYMS_PER_BLOCK);
     }
     // end per stream processing
   }
diff --git a/gr-trellis/src/lib/trellis_permutation.h b/gr-trellis/src/lib/trellis_permutation.h
index 5505caf89..a5c858a8b 100644
--- a/gr-trellis/src/lib/trellis_permutation.h
+++ b/gr-trellis/src/lib/trellis_permutation.h
@@ -30,7 +30,7 @@
 class trellis_permutation;
 typedef boost::shared_ptr<trellis_permutation> trellis_permutation_sptr;
 
-trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT);
+trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
 
 /*!
  * \brief Permutation.
@@ -39,18 +39,18 @@ trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int>
 class trellis_permutation : public gr_sync_block
 {
 private:
-  friend trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT);
+  friend trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
   int d_K;
   std::vector<int> d_TABLE;
   int d_SYMS_PER_BLOCK;
-  size_t d_NBYTES_INOUT;
+  size_t d_BYTES_PER_SYMBOL;
   trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES); 
 
 public:
   int K () const { return d_K; }
   const std::vector<int> & TABLE () const { return d_TABLE; }
   int SYMS_PER_BLOCK () const { return d_SYMS_PER_BLOCK; }
-  size_t NBYTES_INOUT () const { return d_NBYTES_INOUT; }
+  size_t BYTES_PER_SYMBOL () const { return d_BYTES_PER_SYMBOL; }
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
diff --git a/gr-trellis/src/lib/trellis_permutation.i b/gr-trellis/src/lib/trellis_permutation.i
index 834a36986..1433a6584 100644
--- a/gr-trellis/src/lib/trellis_permutation.i
+++ b/gr-trellis/src/lib/trellis_permutation.i
@@ -22,7 +22,7 @@
 
 GR_SWIG_BLOCK_MAGIC(trellis,permutation);
 
-trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT);
+trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
 
 class trellis_permutation : public gr_sync_block
 {
@@ -30,12 +30,12 @@ private:
   int d_K;
   std::vector<int> d_TABLE;
   int d_SYMS_PER_BLOCK;
-  size_t d_NBYTES_INOUT;
-  trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT); 
+  size_t d_BYTES_PER_SYMBOL;
+  trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL); 
 
 public:
   int K () const { return d_K; }
   const std::vector<int> & TABLE () const { return d_TABLE; }
   int SYMS_PER_BLOCK () const { return d_SYMS_PER_BLOCK; }
-  size_t NBYTES_INOUT () const { return d_NBYTES_INOUT; }
+  size_t BYTES_PER_SYMBOL () const { return d_BYTES_PER_SYMBOL; }
 };
diff --git a/gr-uhd/.gitignore b/gr-uhd/.gitignore
index b336cc7ce..a37fc0c1a 100644
--- a/gr-uhd/.gitignore
+++ b/gr-uhd/.gitignore
@@ -1,2 +1,3 @@
 /Makefile
 /Makefile.in
+/*.pc
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index 7e73a5b39..42a35b1c1 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -31,6 +31,7 @@ BUILT_SOURCES += $(generated_uhd_usrp_blocks)
 
 dist_grcblocks_DATA = \
 	uhd_block_tree.xml \
+	uhd_amsg_source.xml \
 	$(BUILT_SOURCES)
 
 ########################################################################
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index 82b6aa964..c77df6c97 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -29,20 +29,34 @@ MAIN_TMPL = """\
 	io_type=uhd.io_type.\$type.type,
 	num_channels=\$nchan,
 )
-\#if \$ref_clk()
-self.\$(id).set_clock_config(uhd.clock_config.external(), uhd.ALL_MBOARDS)
-\#end if
-\#if \$sync()
-self.\$(id).set_time_unknown_pps(uhd.time_spec())
-\#end if
 \#if \$clock_rate()
 self.\$(id).set_clock_rate(\$clock_rate, uhd.ALL_MBOARDS)
 \#end if
 #for $m in range($max_mboards)
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'external'
+self.\$(id).set_clock_config(uhd.clock_config.external(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'internal'
+self.\$(id).set_clock_config(uhd.clock_config.internal(), $m)
+\#end if
+########################################################################
+\#if \$num_mboards() > $m and \$ref_source$(m)() == 'mimo'
+_config = uhd.clock_config()
+_config.ref_source = uhd.clock_config.REF_MIMO
+_config.pps_source = uhd.clock_config.PPS_MIMO
+self.\$(id).set_clock_config(_config, $m)
+\#end if
+########################################################################
 \#if \$num_mboards() > $m and \$sd_spec$(m)()
 self.\$(id).set_subdev_spec(\$sd_spec$(m), $m)
 \#end if
+########################################################################
 #end for
+\#if \$sync()
+self.\$(id).set_time_unknown_pps(uhd.time_spec())
+\#end if
 self.\$(id).set_samp_rate(\$samp_rate)
 #for $n in range($max_nchan)
 \#if \$nchan() > $n
@@ -95,21 +109,6 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 		</hide>
 	</param>
 	<param>
-		<name>Ref Clock</name>
-		<key>ref_clk</key>
-		<value></value>
-		<type>enum</type>
-		<hide>\#if \$ref_clk() then 'none' else 'part'#</hide>
-		<option>
-			<name>External</name>
-			<key>ext</key>
-		</option>
-		<option>
-			<name>Internal</name>
-			<key></key>
-		</option>
-	</param>
-	<param>
 		<name>Sync</name>
 		<key>sync</key>
 		<value></value>
@@ -150,6 +149,25 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 	</param>
 	#for $m in range($max_mboards)
 	<param>
+		<name>Mb$(m): Ref Source</name>
+		<key>ref_source$(m)</key>
+		<value></value>
+		<type>enum</type>
+		<hide>
+			\#if not \$num_mboards() > $m
+				all
+			\#elif \$ref_source$(m)()
+				none
+			\#else
+				part
+			\#end if
+		</hide>
+		<option><name>Default</name><key></key></option>
+		<option><name>Internal</name><key>internal</key></option>
+		<option><name>External</name><key>external</key></option>
+		<option><name>MIMO Cable</name><key>mimo</key></option>
+	</param>
+	<param>
 		<name>Mb$(m): Subdev Spec</name>
 		<key>sd_spec$(m)</key>
 		<value></value>
@@ -209,6 +227,11 @@ USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
 Num Motherboards:
 Selects the number of USRP motherboards in this device configuration.
 
+Reference Source:
+Where the motherboard should sync its time and clock references.
+If source and sink blocks reference the same device,
+it is only necessary to set the reference source on one of the blocks.
+
 Subdevice specification:
 Each motherboard should have its own subdevice specification \\
 and all subdevice specifications should be the same length. \\
diff --git a/gr-uhd/grc/uhd_amsg_source.xml b/gr-uhd/grc/uhd_amsg_source.xml
new file mode 100644
index 000000000..78c9d7b58
--- /dev/null
+++ b/gr-uhd/grc/uhd_amsg_source.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<block>
+	<name>UHD: USRP Async Msg Source</name>
+	<key>uhd_amsg_source</key>
+	<import>from gnuradio import uhd</import>
+	<make>uhd.amsg_source(device_addr=$dev_addr, msgq=$(id)_msgq_out)</make>
+	<param>
+		<name>Device Addr</name>
+		<key>dev_addr</key>
+		<value></value>
+		<type>string</type>
+		<hide>
+			#if $dev_addr()
+				none
+			#else
+				part
+			#end if
+		</hide>
+	</param>
+        <source>
+                <name>out</name>
+                <type>msg</type>
+        </source>
+</block>
diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
index 8a9f62f7c..5d3b49393 100644
--- a/gr-uhd/grc/uhd_block_tree.xml
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -10,5 +10,6 @@
 		<name>UHD</name>
 		<block>uhd_usrp_source</block>
 		<block>uhd_usrp_sink</block>
+		<block>uhd_amsg_source</block>
 	</cat>
 </cat>
diff --git a/gr-uhd/include/Makefile.am b/gr-uhd/include/Makefile.am
index 4a04c98c1..70b80681b 100644
--- a/gr-uhd/include/Makefile.am
+++ b/gr-uhd/include/Makefile.am
@@ -24,4 +24,5 @@ include $(top_srcdir)/Makefile.common
 grinclude_HEADERS = \
 	gr_uhd_api.h \
 	gr_uhd_usrp_source.h \
-	gr_uhd_usrp_sink.h
+	gr_uhd_usrp_sink.h \
+	gr_uhd_amsg_source.h
diff --git a/gr-uhd/include/gr_uhd_amsg_source.h b/gr-uhd/include/gr_uhd_amsg_source.h
new file mode 100644
index 000000000..bc0feb438
--- /dev/null
+++ b/gr-uhd/include/gr_uhd_amsg_source.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GR_UHD_AMSG_SOURCE_H
+#define INCLUDED_GR_UHD_AMSG_SOURCE_H
+
+#include <gr_uhd_api.h>
+#include <uhd/usrp/multi_usrp.hpp>
+#include <gr_msg_queue.h>
+
+class uhd_amsg_source;
+
+GR_UHD_API boost::shared_ptr<uhd_amsg_source> uhd_make_amsg_source(
+    const uhd::device_addr_t &device_addr,
+    gr_msg_queue_sptr msgq
+);
+
+class GR_UHD_API uhd_amsg_source{
+};
+
+#endif /* INCLUDED_GR_UHD_AMSG_SOURCE_H */
diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h
index 36331f782..6e51a1423 100644
--- a/gr-uhd/include/gr_uhd_usrp_source.h
+++ b/gr-uhd/include/gr_uhd_usrp_source.h
@@ -125,7 +125,6 @@ public:
 
     /*!
      * Get the actual dboard gain setting of named stage.
-     * \param name the name of the gain stage
      * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index c27682f7f..c322c6124 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -31,7 +31,8 @@ lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
 	gr_uhd_usrp_source.cc \
-	gr_uhd_usrp_sink.cc
+	gr_uhd_usrp_sink.cc \
+	gr_uhd_amsg_source.cc
 
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
diff --git a/gr-uhd/lib/gr_uhd_amsg_source.cc b/gr-uhd/lib/gr_uhd_amsg_source.cc
new file mode 100644
index 000000000..f2958f115
--- /dev/null
+++ b/gr-uhd/lib/gr_uhd_amsg_source.cc
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <gr_uhd_amsg_source.h>
+#include <boost/bind.hpp>
+#include <gruel/thread.h>
+
+/***********************************************************************
+ * UHD Asynchronous Message Source Impl
+ **********************************************************************/
+class uhd_amsg_source_impl : public uhd_amsg_source{
+public:
+    uhd_amsg_source_impl(
+        const uhd::device_addr_t &device_addr,
+        gr_msg_queue_sptr msgq
+    ):
+        _msgq(msgq), _running(true)
+    {
+        _dev = uhd::usrp::multi_usrp::make(device_addr);
+        _amsg_thread =
+            gruel::thread(boost::bind(&uhd_amsg_source_impl::recv_loop, this));
+    }
+
+    ~uhd_amsg_source_impl()
+    {
+        _running = false;
+        _amsg_thread.join();
+    }
+
+    void recv_loop()
+    {
+        gr_message_sptr msg;
+        uhd::async_metadata_t *md;
+
+        while (_running) {
+            msg = gr_make_message(0, 0.0, 0.0, sizeof(uhd::async_metadata_t));
+            md = (uhd::async_metadata_t *) msg->msg();
+
+            while (!_dev->get_device()->recv_async_msg(*md, 0.1)) {
+                if (!_running)
+                    return;
+            }
+
+            post(msg);
+        }
+    }
+
+    void post(gr_message_sptr msg)
+    {
+        _msgq->insert_tail(msg);
+    }
+
+protected:
+    uhd::usrp::multi_usrp::sptr _dev;
+    gruel::thread _amsg_thread;
+    gr_msg_queue_sptr _msgq;
+    bool _running;
+};
+
+/***********************************************************************
+ * Make UHD Asynchronous Message Source
+ **********************************************************************/
+boost::shared_ptr<uhd_amsg_source> uhd_make_amsg_source(
+    const uhd::device_addr_t &device_addr,
+    gr_msg_queue_sptr msgq
+){
+    return boost::shared_ptr<uhd_amsg_source>(
+        new uhd_amsg_source_impl(device_addr, msgq)
+    );
+}
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 9983489c3..669f890ea 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -182,19 +182,37 @@ public:
         gr_vector_const_void_star &input_items,
         gr_vector_void_star &output_items
     ){
-        //wait for a packet to become available
+        //In order to allow for low-latency:
+        //We receive all available packets without timeout.
+        //This call can timeout under regular operation...
         size_t num_samps = _dev->get_device()->recv(
             output_items, noutput_items, _metadata,
-            _type, uhd::device::RECV_MODE_ONE_PACKET, 1.0
+            _type, uhd::device::RECV_MODE_FULL_BUFF, 0.0
         );
 
+        //If receive resulted in a timeout condition:
+        //We now receive a single packet with a large timeout.
+        if (_metadata.error_code == uhd::rx_metadata_t::ERROR_CODE_TIMEOUT){
+            num_samps = _dev->get_device()->recv(
+                output_items, noutput_items, _metadata,
+                _type, uhd::device::RECV_MODE_ONE_PACKET, 1.0
+            );
+        }
+
         //handle possible errors conditions
         switch(_metadata.error_code){
         case uhd::rx_metadata_t::ERROR_CODE_NONE:
+            //TODO insert tag for time stamp
             break;
 
+        case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
+            //Assume that the user called stop() on the flow graph.
+            //However, a timeout can occur under error conditions.
+            return WORK_DONE;
+
         case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
             //ignore overflows and try work again
+            //TODO insert tag for overflow
             return work(noutput_items, input_items, output_items);
 
         default:
@@ -204,18 +222,6 @@ public:
             return num_samps;
         }
 
-        //advance the pointers and count by num_samps
-        noutput_items -= num_samps;
-        for (size_t i = 0; i < _nchan; i++){
-            _tmp_buffs[i] = static_cast<char *>(output_items[i]) + num_samps*_type.size;
-        }
-
-        //receive all available packets without timeout
-        num_samps += _dev->get_device()->recv(
-            _tmp_buffs, noutput_items, _metadata,
-            _type, uhd::device::RECV_MODE_FULL_BUFF, 0.0
-        );
-
         return num_samps;
     }
 
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index 7ed689ec0..5c0c011b7 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -60,7 +60,7 @@ def _prepare_uhd_swig():
         if attr.endswith('_t'): setattr(uhd_swig, attr[:-2], myobj)
 
     #Cast constructor args (FIXME swig handle overloads?)
-    for attr in ('usrp_source', 'usrp_sink'):
+    for attr in ('usrp_source', 'usrp_sink', 'amsg_source'):
         def constructor_factory(old_constructor):
             def constructor_interceptor(*args, **kwargs):
                 args = list(args)
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 9bdb962c9..b58fe9e18 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -55,6 +55,7 @@
 %{
 #include <gr_uhd_usrp_source.h>
 #include <gr_uhd_usrp_sink.h>
+#include <gr_uhd_amsg_source.h>
 %}
 
 ////////////////////////////////////////////////////////////////////////
@@ -114,6 +115,9 @@ GR_SWIG_BLOCK_MAGIC(uhd,usrp_source)
 GR_SWIG_BLOCK_MAGIC(uhd,usrp_sink)
 %include <gr_uhd_usrp_sink.h>
 
+GR_SWIG_BLOCK_MAGIC(uhd,amsg_source)
+%include <gr_uhd_amsg_source.h>
+
 ////////////////////////////////////////////////////////////////////////
 // helpful constants
 ////////////////////////////////////////////////////////////////////////
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
index c3955ad9d..d014b7c75 100644
--- a/gr-usrp/apps/Makefile.am
+++ b/gr-usrp/apps/Makefile.am
@@ -52,3 +52,16 @@ usrp_rx_cfile_SOURCES = 	\
 
 usrp_siggen_SOURCES = 	\
     usrp_siggen.cc
+
+if PYTHON
+
+bin_SCRIPTS = \
+    lsusrp \
+    usrp_print_db.py \
+    usrp_rx_cfile.py \
+    usrp_test_counting.py \
+    usrp_test_loopback.py
+
+EXTRA_DIST += $(bin_SCRIPTS)
+
+endif
diff --git a/gr-utils/src/python/lsusrp b/gr-usrp/apps/lsusrp
index d2eab33fe..d2eab33fe 100755
--- a/gr-utils/src/python/lsusrp
+++ b/gr-usrp/apps/lsusrp
diff --git a/gr-utils/src/python/usrp_print_db.py b/gr-usrp/apps/usrp_print_db.py
index b082cb073..b082cb073 100755
--- a/gr-utils/src/python/usrp_print_db.py
+++ b/gr-usrp/apps/usrp_print_db.py
diff --git a/gr-utils/src/python/usrp_rx_cfile.py b/gr-usrp/apps/usrp_rx_cfile.py
index 3ac9fb56f..3ac9fb56f 100755
--- a/gr-utils/src/python/usrp_rx_cfile.py
+++ b/gr-usrp/apps/usrp_rx_cfile.py
diff --git a/gr-utils/src/python/usrp_test_counting.py b/gr-usrp/apps/usrp_test_counting.py
index a8300afe2..a8300afe2 100755
--- a/gr-utils/src/python/usrp_test_counting.py
+++ b/gr-usrp/apps/usrp_test_counting.py
diff --git a/gr-utils/src/python/usrp_test_loopback.py b/gr-usrp/apps/usrp_test_loopback.py
index b58ac06ae..b58ac06ae 100755
--- a/gr-utils/src/python/usrp_test_loopback.py
+++ b/gr-usrp/apps/usrp_test_loopback.py
diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am
index f6120884a..895032fb0 100644
--- a/gr-usrp2/Makefile.am
+++ b/gr-usrp2/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
+SUBDIRS = src apps
 
 if PYTHON
 SUBDIRS += grc
diff --git a/gr-usrp2/apps/.gitignore b/gr-usrp2/apps/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-usrp2/apps/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gr-usrp2/apps/Makefile.am b/gr-usrp2/apps/Makefile.am
new file mode 100644
index 000000000..e1cec4cfc
--- /dev/null
+++ b/gr-usrp2/apps/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST += \
+    $(bin_SCRIPTS)
+
+if PYTHON
+
+bin_SCRIPTS = \
+    usrp2_rx_cfile.py
+
+endif
diff --git a/gr-utils/src/python/usrp2_rx_cfile.py b/gr-usrp2/apps/usrp2_rx_cfile.py
index 1f23eee4e..1f23eee4e 100755
--- a/gr-utils/src/python/usrp2_rx_cfile.py
+++ b/gr-usrp2/apps/usrp2_rx_cfile.py
diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am
index 450032266..b422bfd05 100644
--- a/gr-utils/src/python/Makefile.am
+++ b/gr-utils/src/python/Makefile.am
@@ -50,16 +50,9 @@ bin_SCRIPTS = \
     gr_plot_short.py \
     gr_plot_qt.py \
     gr_filter_design.py \
-    lsusrp \
     usrp_fft.py \
     usrp_oscope.py \
-    usrp_print_db.py \
-    usrp_rx_cfile.py \
     usrp_rx_nogui.py \
     usrp_siggen.py \
     usrp_siggen_gui.py \
-    usrp_test_counting.py \
-    usrp_test_loopback.py \
-    usrp2_fft.py \
-    usrp2_rx_cfile.py
-
+    usrp2_fft.py
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 763faf584..a9f9427e9 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -206,13 +206,6 @@ dist_ourdata_DATA = \
 	parameter.xml \
 	random_source_x.xml \
 	root_raised_cosine_filter.xml \
-	trellis_encoder_xx.xml \
-	trellis_metrics_x.xml \
-	trellis_permutation.xml \
-	trellis_siso_combined_f.xml \
-	trellis_siso_f.xml \
-	trellis_viterbi_combined_xx.xml \
-	trellis_viterbi_x.xml \
 	variable.xml \
 	variable_config.xml \
 	variable_function_probe.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index e9382d158..f82d40f85 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -236,13 +236,6 @@
 		<name>Error Correction</name>
 		<cat>
 			<name>Trellis</name>
-			<block>trellis_encoder_xx</block>
-			<block>trellis_metrics_x</block>
-			<block>trellis_permutation</block>
-			<block>trellis_siso_combined_f</block>
-			<block>trellis_siso_f</block>
-			<block>trellis_viterbi_combined_xx</block>
-			<block>trellis_viterbi_x</block>
 		</cat>
 
 		<block>gr_encode_ccsds_27_bb</block>
diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml
index a0e630c7e..fad0b3879 100644
--- a/grc/blocks/gr_quadrature_demod_cf.xml
+++ b/grc/blocks/gr_quadrature_demod_cf.xml
@@ -9,6 +9,7 @@
 	<key>gr_quadrature_demod_cf</key>
 	<import>from gnuradio import gr</import>
 	<make>gr.quadrature_demod_cf($gain)</make>
+    <callback>set_gain($gain)</callback>
 	<param>
 		<name>Gain</name>
 		<key>gain</key>
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index d5e53b52b..0878be4ba 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -65,9 +65,18 @@ class $(class_name)(gr.top_block, Qt.QWidget):
 		Qt.QWidget.__init__(self)
 		self.setWindowTitle("$title")
 		self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc'))
-		self.top_layout = Qt.QVBoxLayout(self)
+		self.top_scroll_layout = Qt.QVBoxLayout()
+		self.setLayout(self.top_scroll_layout)
+		self.top_scroll = Qt.QScrollArea()
+		self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame)
+		self.top_scroll_layout.addWidget(self.top_scroll)
+		self.top_scroll.setWidgetResizable(True)
+		self.top_widget = Qt.QWidget()
+		self.top_scroll.setWidget(self.top_widget)
+		self.top_layout = Qt.QVBoxLayout(self.top_widget)
 		self.top_grid_layout = Qt.QGridLayout()
 		self.top_layout.addLayout(self.top_grid_layout)
+
 #elif $generate_options == 'no_gui'
 class $(class_name)(gr.top_block):
 
diff --git a/gruel/src/python/.gitignore b/gruel/src/python/.gitignore
index b336cc7ce..604b402c5 100644
--- a/gruel/src/python/.gitignore
+++ b/gruel/src/python/.gitignore
@@ -1,2 +1,3 @@
 /Makefile
 /Makefile.in
+/run_tests
diff --git a/gruel/src/swig/.gitignore b/gruel/src/swig/.gitignore
index b336cc7ce..f99fdb19b 100644
--- a/gruel/src/swig/.gitignore
+++ b/gruel/src/swig/.gitignore
@@ -1,2 +1,4 @@
 /Makefile
 /Makefile.in
+/python
+/pmt_swig.py
diff --git a/usrp/firmware/include/usrp_ids.h b/usrp/firmware/include/usrp_ids.h
index 46a069434..159151ea9 100644
--- a/usrp/firmware/include/usrp_ids.h
+++ b/usrp/firmware/include/usrp_ids.h
@@ -44,21 +44,31 @@
 #define USB_PID_FSF_HPSDR_HA    	0x0007    // High Performance Software Defined Radio (Host Assisted Boot)
 #define USB_PID_FSF_QS1R	    	0x0008    // QS1R HF receiver
 #define USB_PID_FSF_EZDOP	    	0x0009    // ezdop <jcorgan@aeinet.com>
-#define USB_PID_FSF_BDALE_0		0x000a	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_1		0x000b	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_2		0x000c	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_3		0x000d	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_4		0x000e	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_5		0x000f	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_6		0x0010	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_7		0x0011	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_8		0x0012	  // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_Development   0x000a    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleMetrum    0x000b    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleDongle    0x000c    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleTerra     0x000d    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleBT        0x000e    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleLaunch    0x000f    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleLCO       0x0010    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TeleScience   0x0011    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_TelePyro      0x0012    // Bdale Garbee <bdale@gag.com>
 #define USB_PID_FSF_BDALE_9		0x0013	  // Bdale Garbee <bdale@gag.com>
 #define USB_PID_FSF_HPSDR_HERMES	0x0014	  // HPSDR Hermes
 #define USB_PID_FSF_THINKRF		0x0015	  // Catalin Patulea <catalin.patulea@thinkrf.com>
 #define USB_PID_FSF_MSA			0x0016	  // Hans de Bok <hdbok@dionaea.demon.nl> Scotty's Modular Spectrum Analyzer
 
 #define USB_PID_FSF_LBNL_UXO            0x0018    // http://recycle.lbl.gov/~ldoolitt/uxo/
+#define USB_PID_FSF_BDALE_10            0x0019    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_11            0x001a    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_12            0x001b    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_13            0x001c    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_14            0x001d    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_15            0x001e    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_16            0x001f    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_17            0x0020    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_18            0x0021    // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_BDALE_19            0x0022    // Bdale Garbee <bdale@gag.com>
 
 
 #define	USB_DID_USRP_0			0x0000	  // unconfigured rev 0 USRP
diff --git a/version.sh b/version.sh
index 9f729d508..759d52806 100644
--- a/version.sh
+++ b/version.sh
@@ -1,4 +1,4 @@
 MAJOR_VERSION=3
 API_COMPAT=4
-MINOR_VERSION=0
-MAINT_VERSION=0
\ No newline at end of file
+MINOR_VERSION=1
+MAINT_VERSION=git
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
new file mode 100644
index 000000000..22c09b3f8
--- /dev/null
+++ b/volk/CMakeLists.txt
@@ -0,0 +1,88 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# Project setup
+########################################################################
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+IF(NOT DEFINED CMAKE_BUILD_TYPE)
+    SET(CMAKE_BUILD_TYPE Release)
+ENDIF()
+SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
+PROJECT(volk)
+ENABLE_LANGUAGE(CXX)
+ENABLE_LANGUAGE(C)
+ENABLE_TESTING()
+SET(VERSION 0.1)
+SET(LIBVER 0.0.0)
+
+########################################################################
+# Dependencies setup
+########################################################################
+FIND_PACKAGE(PythonInterp)
+IF(NOT PYTHONINTERP_FOUND)
+    MESSAGE(FATAL_ERROR "Python interpreter required by the build system.")
+ENDIF(NOT PYTHONINTERP_FOUND)
+
+########################################################################
+# Setup the package config file
+########################################################################
+#set variables found in the pc.in file
+SET(prefix ${CMAKE_INSTALL_PREFIX})
+SET(exec_prefix "\${prefix}")
+SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+SET(includedir "\${prefix}/include")
+
+CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/volk.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
+@ONLY)
+
+INSTALL(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
+    DESTINATION lib${LIB_SUFFIX}/pkgconfig
+)
+
+########################################################################
+# Install all headers in the include directories
+########################################################################
+INSTALL(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/include/volk
+    DESTINATION include FILES_MATCHING PATTERN "*.h"
+)
+
+INSTALL(FILES
+    ${CMAKE_BINARY_DIR}/include/volk/volk.h
+    ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h
+    ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h
+    ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h
+DESTINATION include/volk)
+
+########################################################################
+# Setup the library
+########################################################################
+ADD_SUBDIRECTORY(lib)
+
+########################################################################
+# And the utility apps
+########################################################################
+ADD_SUBDIRECTORY(apps)
+
+########################################################################
+# Print summary
+########################################################################
+MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
diff --git a/volk/Makefile.am b/volk/Makefile.am
index 03c5aac35..829c37b78 100644
--- a/volk/Makefile.am
+++ b/volk/Makefile.am
@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I config
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = bootstrap configure config.h.in volk_config.h
+EXTRA_DIST = bootstrap configure config.h.in
 SUBDIRS = config
 if LV_HAVE_ORC
 SUBDIRS += orc
@@ -38,7 +38,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = volk.pc
 
 distclean-local:
-	-rm -f config/lv_set_simd_flags.m4
 	-rm -rf autom4te.cache
 	-rm -f config.*
 	-rm -f depcomp
@@ -61,3 +60,6 @@ distclean-local:
 	-rm -f configure
 	-rm -f orc/Makefile.in
 	-rm -f orc/*.c
+	-rm -rf gen/config
+	-rm -rf gen/include
+	-rm -rf gen/lib
diff --git a/volk/Makefile.common b/volk/Makefile.common
index eca2c6516..b9949cb33 100644
--- a/volk/Makefile.common
+++ b/volk/Makefile.common
@@ -20,21 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-if MD_CPU_generic
-    platform_CODE = \
-	$(top_srcdir)/lib/volk_cpu_generic.c
-endif
-
-if MD_CPU_x86
-    platform_CODE = \
-	$(top_srcdir)/lib/volk_cpu_x86.c
-endif
-
-if MD_CPU_powerpc
-    platform_CODE = \
-	$(top_srcdir)/lib/volk_cpu_powerpc.c
-endif
-
+#define gendir for files generated during bootstrap
+top_gendir = $(top_srcdir)/gen
 
 ourincludedir   = $(includedir)/volk
 
diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt
new file mode 100644
index 000000000..a0bf7e900
--- /dev/null
+++ b/volk/apps/CMakeLists.txt
@@ -0,0 +1,38 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# Setup profiler
+########################################################################
+IF(MSVC)
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc)
+ENDIF(MSVC)
+
+INCLUDE_DIRECTORIES(
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+ADD_EXECUTABLE(volk_profile
+    ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
+    ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
+)
+
+TARGET_LINK_LIBRARIES(volk_profile volk ${Boost_LIBRARIES})
diff --git a/volk/apps/volk_profile.cc b/volk/apps/volk_profile.cc
new file mode 100644
index 000000000..b9ac9ecc2
--- /dev/null
+++ b/volk/apps/volk_profile.cc
@@ -0,0 +1,135 @@
+#include "qa_utils.h"
+extern "C" {
+#include <volk/volk.h>
+#include <volk/volk_prefs.h>
+}
+#include <vector>
+#include <boost/foreach.hpp>
+#include <iostream>
+#include <fstream>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+int main(int argc, char *argv[]) {
+
+    std::vector<std::string> results;
+    
+    //VOLK_PROFILE(volk_16i_x5_add_quad_16i_x4_a, 1e-4, 2046, 10000, &results);
+    //VOLK_PROFILE(volk_16i_branch_4_state_8_a, 1e-4, 2046, 10000, &results);
+    VOLK_PROFILE(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16ic_deinterleave_real_8i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16ic_deinterleave_16i_x2_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16ic_s32f_deinterleave_32f_x2_a, 1e-4, 32768.0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_16ic_deinterleave_real_16i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16ic_magnitude_16i_a, 1, 0, 204600, 100, &results);
+    VOLK_PROFILE(volk_16ic_s32f_magnitude_32f_a, 1e-5, 32768.0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_16i_s32f_convert_32f_a, 1e-4, 32768.0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16i_convert_8i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16i_convert_8i_u, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16i_max_star_16i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_16i_max_star_horizontal_16i_a, 0, 0, 204600, 10000, &results);
+    //VOLK_PROFILE(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 10000, &results);
+    //VOLK_PROFILE(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 10000, &results);
+    VOLK_PROFILE(volk_16u_byteswap_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_accumulator_s32f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_x2_add_32f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_32f_multiply_32fc_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_s32f_power_32fc_a, 1e-4, 0, 204600, 50, &results);
+    VOLK_PROFILE(volk_32f_s32f_calc_spectral_noise_floor_32f_a, 1e-4, 20.0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_s32f_atan2_32f_a, 1e-4, 10.0, 204600, 100, &results);
+    //VOLK_PROFILE(volk_32fc_x2_conjugate_dot_prod_32fc_a, 1e-4, 0, 2046, 10000, &results);
+    VOLK_PROFILE(volk_32fc_x2_conjugate_dot_prod_32fc_u, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_deinterleave_32f_x2_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_deinterleave_64f_x2_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_s32f_deinterleave_real_16i_a, 0, 32768, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_deinterleave_real_32f_a, 1e-4, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32fc_deinterleave_real_64f_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_x2_dot_prod_32fc_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_index_max_16u_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 204600, 100, &results);
+    VOLK_PROFILE(volk_32fc_magnitude_32f_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32fc_x2_multiply_32fc_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_16i_a, 1, 32768, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_16i_u, 1, 32768, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_32i_a, 1, 2<<31, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_32i_u, 1, 2<<31, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_convert_64f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_convert_64f_u, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_8i_a, 1, 128, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_convert_8i_u, 1, 128, 204600, 10000, &results);
+    //VOLK_PROFILE(volk_32fc_s32f_x2_power_spectral_density_32f_a, 1e-4, 2046, 10000, &results);
+    VOLK_PROFILE(volk_32fc_s32f_power_spectrum_32f_a, 1e-4, 0, 20460, 100, &results);
+    VOLK_PROFILE(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_x2_divide_32f_a, 1e-4, 0, 204600, 2000, &results);
+    VOLK_PROFILE(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 204600, 5000, &results);
+    //VOLK_PROFILE(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000, &results);
+    VOLK_PROFILE(volk_32f_index_max_16u_a, 0, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 204600, 3000, &results);
+    VOLK_PROFILE(volk_32f_x2_interleave_32fc_a, 0, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32f_x2_max_32f_a, 1e-4, 0, 204600, 2000, &results);
+    VOLK_PROFILE(volk_32f_x2_min_32f_a, 1e-4, 0, 204600, 2000, &results);
+    VOLK_PROFILE(volk_32f_x2_multiply_32f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_normalize_a, 1e-4, 100, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32f_s32f_power_32f_a, 1e-4, 4, 204600, 100, &results);
+    VOLK_PROFILE(volk_32f_sqrt_32f_a, 1e-4, 0, 204600, 100, &results);
+    VOLK_PROFILE(volk_32f_s32f_stddev_32f_a, 1e-4, 100, 204600, 3000, &results);
+    VOLK_PROFILE(volk_32f_stddev_and_mean_32f_x2_a, 1e-4, 0, 204600, 3000, &results);
+    VOLK_PROFILE(volk_32f_x2_subtract_32f_a, 1e-4, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32f_x3_sum_of_poly_32f_a, 1e-4, 0, 204600, 5000, &results);
+    VOLK_PROFILE(volk_32i_x2_and_32i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32i_s32f_convert_32f_a, 1e-4, 100, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32i_s32f_convert_32f_u, 1e-4, 100, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32i_x2_or_32i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_32u_byteswap_a, 0, 0, 204600, 2000, &results);
+    //VOLK_PROFILE(volk_32u_popcnt_a, 0, 0, 2046, 10000, &results);
+    VOLK_PROFILE(volk_64f_convert_32f_a, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_64f_convert_32f_u, 1e-4, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_64f_x2_max_64f_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_64f_x2_min_64f_a, 1e-4, 0, 204600, 1000, &results);
+    VOLK_PROFILE(volk_64u_byteswap_a, 0, 0, 204600, 1000, &results);
+    //VOLK_PROFILE(volk_64u_popcnt_a, 0, 0, 2046, 10000, &results);
+    VOLK_PROFILE(volk_8ic_deinterleave_16i_x2_a, 0, 0, 204600, 3000, &results);
+    VOLK_PROFILE(volk_8ic_s32f_deinterleave_32f_x2_a, 1e-4, 100, 204600, 3000, &results);
+    VOLK_PROFILE(volk_8ic_deinterleave_real_16i_a, 0, 256, 204600, 3000, &results);
+    VOLK_PROFILE(volk_8ic_s32f_deinterleave_real_32f_a, 1e-4, 100, 204600, 3000, &results);
+    VOLK_PROFILE(volk_8ic_deinterleave_real_8i_a, 0, 0, 204600, 10000, &results);
+    VOLK_PROFILE(volk_8ic_x2_multiply_conjugate_16ic_a, 0, 0, 204600, 400, &results);
+    VOLK_PROFILE(volk_8ic_x2_s32f_multiply_conjugate_32fc_a, 1e-4, 100, 204600, 400, &results);
+    VOLK_PROFILE(volk_8i_convert_16i_a, 0, 0, 204600, 20000, &results);
+    VOLK_PROFILE(volk_8i_convert_16i_u, 0, 0, 204600, 2000, &results);
+    VOLK_PROFILE(volk_8i_s32f_convert_32f_a, 1e-4, 100, 204600, 2000, &results);
+    VOLK_PROFILE(volk_8i_s32f_convert_32f_u, 1e-4, 100, 204600, 2000, &results);
+
+    char path[256];
+    get_config_path(path);
+    std::string config_path(path);
+    std::ofstream config;
+    std::cout << "filename: " << config_path << std::endl;
+    config.open(config_path.c_str());
+    if(!config.is_open()) { //either we don't have write access or we don't have the dir yet
+        std::string dir(getenv("HOME"));
+        dir += "/.volk";
+        if(mkdir(dir.c_str(), 0777) == -1) {
+            std::cout << "Error creating directory " << dir << std::endl;
+            return -1;
+        }
+        config.open(config_path.c_str());
+        if(!config.is_open()) {
+            std::cout << "Error opening file " << config_path << std::endl;
+            return -1;
+        }
+    }
+
+    config << "\
+#this file is generated by volk_profile.\n\
+#the function name is followed by the preferred architecture.\n\
+";
+    
+    BOOST_FOREACH(std::string result, results) {
+        config << result << std::endl;
+    }
+    config.close();
+}
diff --git a/volk/bootstrap b/volk/bootstrap
index ff239c88c..838f03aa2 100755
--- a/volk/bootstrap
+++ b/volk/bootstrap
@@ -20,8 +20,14 @@
 # Boston, MA 02110-1301, USA.
 rm -fr config.cache autom4te*.cache
 
-cd include/volk && chmod +x volk_register.py && ./volk_register.py && cd ../..
-aclocal -I config
+#alternative to -B that wont break on python 2.5
+PYTHONDONTWRITEBYTECODE=1
+export PYTHONDONTWRITEBYTECODE
+python gen/volk_register.py
+
+mv gen/lib/Makefile.am lib/
+
+aclocal -I config -I gen/config
 autoconf
 autoheader
 libtoolize --automake
diff --git a/volk/config/Makefile.am b/volk/config/Makefile.am
index 27e3f1296..d4786f83a 100644
--- a/volk/config/Makefile.am
+++ b/volk/config/Makefile.am
@@ -30,7 +30,6 @@ m4macros = \
 	ax_boost_base.m4 \
 	ax_boost_unit_test_framework.m4 \
 	bnv_have_qt.m4 \
-	cppunit.m4 \
 	gr_lib64.m4 \
 	gr_libgnuradio_core_extra_ldflags.m4 \
 	gr_no_undefined.m4 \
@@ -43,7 +42,7 @@ m4macros = \
 	lf_cxx.m4 \
 	lf_warnings.m4 \
 	lf_x11.m4 \
-	lv_set_simd_flags.m4 \
+	$(top_gendir)/config/lv_set_simd_flags.m4 \
 	mkstemp.m4 \
 	onceonly.m4 \
 	pkg.m4 \
diff --git a/volk/config/cppunit.m4 b/volk/config/cppunit.m4
deleted file mode 100644
index 0991d51ec..000000000
--- a/volk/config/cppunit.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl
-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([AM_PATH_CPPUNIT],
-[
-
-AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
-            cppunit_config_prefix="$withval", cppunit_config_prefix="")
-AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
-            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
-
-  if test x$cppunit_config_exec_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-     fi
-  fi
-  if test x$cppunit_config_prefix != x ; then
-     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-     if test x${CPPUNIT_CONFIG+set} != xset ; then
-        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-     fi
-  fi
-
-  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-  cppunit_version_min=$1
-
-  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-  no_cppunit=""
-  if test "$CPPUNIT_CONFIG" = "no" ; then
-    no_cppunit=yes
-  else
-    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-    cppunit_version=`$CPPUNIT_CONFIG --version`
-
-    cppunit_major_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_version=`echo $cppunit_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_major_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    cppunit_minor_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    cppunit_micro_min=`echo $cppunit_version_min | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    cppunit_version_proper=`expr \
-        $cppunit_major_version \> $cppunit_major_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \> $cppunit_minor_min \| \
-        $cppunit_major_version \= $cppunit_major_min \& \
-        $cppunit_minor_version \= $cppunit_minor_min \& \
-        $cppunit_micro_version \>= $cppunit_micro_min `
-
-    if test "$cppunit_version_proper" = "1" ; then
-      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-    else
-      AC_MSG_RESULT(no)
-      no_cppunit=yes
-    fi
-  fi
-
-  if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
-  else
-     CPPUNIT_CFLAGS=""
-     CPPUNIT_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-
-  AC_SUBST(CPPUNIT_CFLAGS)
-  AC_SUBST(CPPUNIT_LIBS)
-])
-
-
-
diff --git a/volk/config/lf_warnings.m4 b/volk/config/lf_warnings.m4
index d40c77f14..e62fb276c 100644
--- a/volk/config/lf_warnings.m4
+++ b/volk/config/lf_warnings.m4
@@ -29,7 +29,8 @@ dnl distribution terms that you use for the rest of that program.
 # -------------------------------------------------------------------------
 
 AC_DEFUN([LF_CHECK_CXX_FLAG],[
-  echo 'void f(){}' > conftest.cc
+  echo "#include <stdio.h>
+int main(int argc, char **argv){return 0;}" > conftest.cc
   for i in $1
   do
     AC_MSG_CHECKING([whether $CXX accepts $i])
@@ -54,7 +55,8 @@ AC_DEFUN([LF_CHECK_CXX_FLAG],[
 # -------------------------------------------------------------------------
 
 AC_DEFUN([LF_CHECK_CC_FLAG],[
-  echo 'void f(){}' > conftest.c
+  echo "#include <stdio.h>
+int main(int argc, char **argv){return 0;}" > conftest.c
   for i in $1
   do
     AC_MSG_CHECKING([whether $CC accepts $i])
diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4
index dfa490cdf..358fba030 100755..100644
--- a/volk/config/lv_configure.m4
+++ b/volk/config/lv_configure.m4
@@ -109,14 +109,6 @@ dnl  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
-  dnl Define where to look for cppunit includes and libs
-  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
-  dnl Try using pkg-config first, then fall back to cppunit-config.
-  PKG_CHECK_EXISTS(cppunit,
-    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
-    [AM_PATH_CPPUNIT([1.9.14],[],
-		     [AC_MSG_ERROR([VOLK requires cppunit.  Stop])])])
-
 dnl  PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
 dnl  LIBS="$LIBS $GNURADIO_CORE_LIBS"
 ])
diff --git a/volk/configure.ac b/volk/configure.ac
index c493adad6..fa3a90c7f 100644
--- a/volk/configure.ac
+++ b/volk/configure.ac
@@ -59,7 +59,6 @@ dnl AX_BOOST_TEST_EXEC_MONITOR
 AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
 
-AC_CONFIG_HEADERS([volk_config.h])
 LV_SET_SIMD_FLAGS
 
 AC_CONFIG_FILES([\
diff --git a/volk/gen/.gitignore b/volk/gen/.gitignore
new file mode 100644
index 000000000..a1c468f93
--- /dev/null
+++ b/volk/gen/.gitignore
@@ -0,0 +1,3 @@
+/config
+/include
+/lib
diff --git a/volk/include/volk/archs.xml b/volk/gen/archs.xml
index a19a5add9..f6822871f 100644
--- a/volk/include/volk/archs.xml
+++ b/volk/gen/archs.xml
@@ -5,14 +5,14 @@
   <flag>none</flag>
 </arch>
 
-<arch name="orc" type="all">
-  <flag>lorc-0.4</flag>
-  <overrule>LV_HAVE_ORC</overrule>
-  <overrule_val>no</overrule_val>
-</arch>
-
 <arch name="altivec" type="powerpc">
   <flag>maltivec</flag>
+  <alignment>16</alignment>
+</arch>
+
+<arch name="neon" type="arm">
+  <flag>mfpu=neon -mfloat-abi=softfp -funsafe-math-optimizations</flag>
+  <alignment>16</alignment>
 </arch>
 
 <arch name="32" type="x86" no_test="true" >
@@ -37,6 +37,7 @@
   <shift>31</shift>
   <flag>m3dnow</flag>
   <val>1</val>
+  <alignment>8</alignment>
 </arch>
 
 <arch name="abm" type="x86">
@@ -45,6 +46,7 @@
   <reg>d</reg>
   <shift>5</shift>
   <flag>sse4.2</flag>
+  <alignment>16</alignment>
 </arch>
 
 <arch name="popcount" type="x86">
@@ -61,6 +63,7 @@
   <reg>d</reg>
   <shift>23</shift>
   <flag>mmmx</flag>
+  <alignment>8</alignment>
 </arch>
 
 
@@ -72,6 +75,7 @@
   <flag>msse</flag>
   <environment>_MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);</environment>
   <include>xmmintrin.h</include>
+  <alignment>16</alignment>
 </arch>
 
 
@@ -81,6 +85,13 @@
   <reg>d</reg>
   <shift>26</shift>
   <flag>msse2</flag>
+  <alignment>16</alignment>
+</arch>
+
+<arch name="orc" type="all">
+  <flag>lorc-0.4</flag>
+  <overrule>LV_HAVE_ORC</overrule>
+  <overrule_val>no</overrule_val>
 </arch>
 
 <arch name="sse3" type="x86">
@@ -91,6 +102,7 @@
   <flag>msse3</flag>
   <environment>_MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);</environment>
   <include>pmmintrin.h</include>
+  <alignment>16</alignment>
 </arch>
 
 <arch name="ssse3" type="x86">
@@ -99,6 +111,7 @@
   <reg>c</reg>
   <shift>9</shift>
   <flag>mssse3</flag>
+  <alignment>16</alignment>
 </arch>
 
 <arch name="sse4_a" type="x86">
@@ -107,6 +120,7 @@
   <reg>c</reg>
   <shift>6</shift>
   <flag>msse4a</flag>
+  <alignment>16</alignment>
 </arch>
 
 
@@ -116,6 +130,7 @@
   <reg>c</reg>
   <shift>19</shift>
   <flag>msse4.1</flag>
+  <alignment>16</alignment>
 </arch>
 
 <arch name="sse4_2" type="x86">
@@ -124,16 +139,16 @@
   <reg>c</reg>
   <shift>20</shift>
   <flag>msse4.2</flag>
+  <alignment>16</alignment>
 </arch>
 
-
 <arch name="avx" type="x86">
   <val>1</val>
   <op>1</op>
   <reg>c</reg>
   <shift>28</shift>
   <flag>mavx</flag>
+  <alignment>32</alignment>
 </arch>
 
-
 </grammar>
diff --git a/volk/gen/machines.xml b/volk/gen/machines.xml
new file mode 100644
index 000000000..b872b9fb1
--- /dev/null
+++ b/volk/gen/machines.xml
@@ -0,0 +1,64 @@
+<grammar>
+
+<machine name="generic">
+<archs>generic</archs>
+</machine>
+
+<!--
+<machine name="mmx">
+<archs>generic 32|64 mmx</archs>
+</machine>
+
+<machine name="sse">
+<archs>generic 32|64 mmx sse</archs>
+</machine>
+-->
+
+<!--
+Create an SSE2 only machine (without 64/32 inline assembly support).
+This machine is intended to support the MSVC compiler on x86/amd64.
+The MSVC compiler has intrinsic support for SSE and SSE2,
+however it does not support the gcc style inline assembly.
+-->
+
+<machine name="neon">
+<archs>generic neon</archs>
+</machine>
+
+<machine name="sse2_only">
+<archs>generic mmx sse sse2</archs>
+</machine>
+
+<machine name="sse2">
+<archs>generic 32|64 mmx sse sse2</archs>
+</machine>
+
+<machine name="sse3">
+<archs>generic 32|64 mmx sse sse2 sse3</archs>
+</machine>
+
+<machine name="ssse3">
+<archs>generic 32|64 mmx sse sse2 sse3 ssse3</archs>
+</machine>
+
+<machine name="sse4_a">
+<archs>generic 32|64 mmx sse sse2 sse3 sse4_a popcount</archs>
+</machine>
+
+<machine name="sse4_1">
+<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1</archs>
+</machine>
+
+<machine name="sse4_2">
+<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount</archs>
+</machine>
+
+<machine name="avx">
+<archs>generic 32|64 mmx sse sse2 sse3 ssse3 sse4_1 sse4_2 popcount avx</archs>
+</machine>
+
+<machine name="altivec">
+<archs>generic altivec</archs>
+</machine>
+
+</grammar>
diff --git a/volk/gen/make_c.py b/volk/gen/make_c.py
new file mode 100644
index 000000000..19d679e71
--- /dev/null
+++ b/volk/gen/make_c.py
@@ -0,0 +1,88 @@
+#
+# Copyright 2010-2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from volk_regexp import *
+import string
+
+#ok todo list:
+#put n_archs into the info struct so it doesn't have to be arch_defs[0].
+
+def make_c(machines, archs, functions, arched_arglist, my_arglist):
+    tempstring = r"""
+// This file is automatically generated by make_c.py.
+// Do not edit this file.
+"""
+    tempstring += """
+#include <volk/volk_common.h>
+#include "volk_machines.h"
+#include <volk/volk_typedefs.h>
+#include <volk/volk_cpu.h>
+#include "volk_rank_archs.h"
+#include <volk/volk.h>
+#include <stdio.h>
+#include <string.h>
+
+"""
+
+#OK here's the deal. the .h prototypes the functions. the .c impls them as fptrs, can use p_whatever.
+#also .c impls the get_machine call
+#also .c impls the default call for each fn
+
+#here do static fn get arch
+    tempstring += r"""
+struct volk_machine *get_machine(void) {
+    extern struct volk_machine *volk_machines[];
+    extern unsigned int n_volk_machines;
+    static struct volk_machine *machine = NULL;
+    
+    if(machine != NULL) return machine;
+    else {
+        unsigned int max_score = 0;
+        int i;
+        for(i=0; i<n_volk_machines; i++) {
+            if(!(volk_machines[i]->caps & (~volk_get_lvarch()))) {
+                if(volk_machines[i]->caps > max_score) {
+                    max_score = volk_machines[i]->caps;
+                    machine = volk_machines[i];
+                }
+            }
+        }
+        printf("Using Volk machine: %s\n", machine->name);
+        return machine;
+    }
+}
+
+unsigned int volk_get_alignment(void) {
+    return get_machine()->alignment;
+}
+
+"""
+    
+    for i in range(len(functions)):
+        tempstring += "void get_" + functions[i] + replace_arch.sub("", arched_arglist[i]) + "\n"
+        tempstring += "    %s = get_machine()->%s_archs[volk_rank_archs(get_machine()->%s_indices, get_machine()->%s_arch_defs, get_machine()->%s_n_archs, get_machine()->%s_name, volk_get_lvarch())];\n" % (functions[i], functions[i], functions[i], functions[i], functions[i], functions[i])
+        tempstring += "    %s(%s);\n}\n\n" % (functions[i], my_arglist[i])
+        tempstring += replace_volk.sub("p", functions[i]) + " " + functions[i] + " = &get_" + functions[i] + ";\n\n"
+        tempstring += "void %s_manual%s\n" % (functions[i], arched_arglist[i])
+        tempstring += "    get_machine()->%s_archs[get_index(get_machine()->%s_indices, get_machine()->%s_n_archs, arch)](%s);\n}\n" % (functions[i], functions[i], functions[i], my_arglist[i])
+        tempstring += "struct volk_func_desc %s_get_func_desc(void) {\n" % (functions[i])
+        tempstring += "    struct volk_func_desc desc = {get_machine()->%s_indices, get_machine()->%s_arch_defs, get_machine()->%s_n_archs};\n" % (functions[i], functions[i], functions[i])
+        tempstring += "    return desc;\n}\n"
+
+    return tempstring
+
+
diff --git a/volk/include/volk/make_config_fixed.py b/volk/gen/make_config_fixed.py
index 3fd1bdf0a..3fd1bdf0a 100644
--- a/volk/include/volk/make_config_fixed.py
+++ b/volk/gen/make_config_fixed.py
diff --git a/volk/include/volk/make_config_in.py b/volk/gen/make_config_in.py
index d29680af2..d29680af2 100644
--- a/volk/include/volk/make_config_in.py
+++ b/volk/gen/make_config_in.py
diff --git a/volk/gen/make_cpuid_c.py b/volk/gen/make_cpuid_c.py
new file mode 100644
index 000000000..eb88dcd7f
--- /dev/null
+++ b/volk/gen/make_cpuid_c.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+from xml.dom import minidom
+
+HEADER_TEMPL = """\
+/*this file is auto_generated by volk_register.py*/
+
+#include <volk/volk_cpu.h>
+#include <volk/volk_config_fixed.h>
+
+struct VOLK_CPU volk_cpu;
+
+#if defined(__i386__) || (__x86_64__)
+
+//implement get cpuid for gcc compilers using a copy of cpuid.h
+#if defined(__GNUC__)
+#include <gcc_x86_cpuid.h>
+#define cpuid_x86(op, r) __get_cpuid(op, r+0, r+1, r+2, r+3)
+
+//implement get cpuid for MSVC compilers using __cpuid intrinsic
+#elif defined(_MSC_VER)
+#include <intrin.h>
+#define cpuid(op, r) __cpuid(r, op)
+
+#else
+#error "A get cpuid for volk is not available on this compiler..."
+#endif
+
+static inline unsigned int cpuid_eax(unsigned int op) {
+    unsigned int regs[4];
+    cpuid_x86 (op, regs);
+    return regs[0];
+}
+
+static inline unsigned int cpuid_ebx(unsigned int op) {
+    unsigned int regs[4];
+    cpuid_x86 (op, regs);
+    return regs[1];
+}
+
+static inline unsigned int cpuid_ecx(unsigned int op) {
+    unsigned int regs[4];
+    cpuid_x86 (op, regs);
+    return regs[2];
+}
+
+static inline unsigned int cpuid_edx(unsigned int op) {
+    unsigned int regs[4];
+    cpuid_x86 (op, regs);
+    return regs[3];
+}
+#endif
+
+"""
+
+def make_cpuid_c(dom) :
+    tempstring = HEADER_TEMPL;
+    
+    for domarch in dom:
+        if str(domarch.attributes["type"].value) == "x86":
+            if "no_test" in domarch.attributes.keys():
+                no_test = str(domarch.attributes["no_test"].value);
+                if no_test == "true":
+                    no_test = True;
+                else:
+                    no_test = False;
+            else:
+                no_test = False;
+            arch = str(domarch.attributes["name"].value);
+            op = domarch.getElementsByTagName("op");
+            if op:
+                op = str(op[0].firstChild.data);
+            reg = domarch.getElementsByTagName("reg");
+            if reg:
+                reg = str(reg[0].firstChild.data);
+            shift = domarch.getElementsByTagName("shift");
+            if shift:
+                shift = str(shift[0].firstChild.data);
+            val = domarch.getElementsByTagName("val");
+            if val:
+                val = str(val[0].firstChild.data);
+            
+            if no_test:
+                tempstring = tempstring + """\
+int i_can_has_%s () {
+#if defined(__i386__) || (__x86_64__)
+    return 1;
+#else
+    return 0;
+#endif
+}
+                
+""" % (arch)
+                
+            elif op == "1":
+                tempstring = tempstring + """\
+int i_can_has_%s () {
+#if defined(__i386__) || (__x86_64__)
+    unsigned int e%sx = cpuid_e%sx (%s);
+    return ((e%sx >> %s) & 1) == %s;
+#else
+    return 0;
+#endif
+}
+
+""" % (arch, reg, reg, op, reg, shift, val)
+
+            elif op == "0x80000001":
+                tempstring = tempstring + """\
+int i_can_has_%s () {
+#if defined(__i386__) || (__x86_64__)
+    unsigned int extended_fct_count = cpuid_eax(0x80000000);
+    if (extended_fct_count < 0x80000001)
+        return %s^1;
+    unsigned int extended_features = cpuid_e%sx (%s);
+    return ((extended_features >> %s) & 1) == %s;
+#else
+    return 0;
+#endif
+}
+
+""" % (arch, val, reg, op, shift, val)
+        
+        elif str(domarch.attributes["type"].value) == "powerpc":
+            arch = str(domarch.attributes["name"].value);
+            tempstring = tempstring + """\
+int i_can_has_%s () {
+#ifdef __PPC__
+    return 1;
+#else
+    return 0;
+#endif
+}
+
+""" % (arch)
+
+        elif str(domarch.attributes["type"].value) == "arm":
+            arch = str(domarch.attributes["name"].value);
+            tempstring = tempstring + """\
+#if defined(__arm__) && defined(__linux__)
+#include <asm/hwcap.h>
+#include <linux/auxvec.h>
+#include <stdio.h>
+#define LOOK_FOR_NEON
+#endif
+
+int i_can_has_%s () {
+//it's linux-specific, but if you're compiling libvolk for NEON
+//on Windows you have other problems
+
+#ifdef LOOK_FOR_NEON
+    FILE *auxvec_f;
+    unsigned long auxvec[2];
+    unsigned int found_neon = 0;
+    auxvec_f = fopen("/proc/self/auxv", "rb");
+    if(!auxvec_f) return 0;
+    
+    //so auxv is basically 32b of ID and 32b of value
+    //so it goes like this
+    while(!found_neon && auxvec_f) {
+      fread(auxvec, sizeof(unsigned long), 2, auxvec_f);
+      if((auxvec[0] == AT_HWCAP) && (auxvec[1] & HWCAP_NEON))
+        found_neon = 1;
+    }
+    
+    fclose(auxvec_f);
+    return found_neon;
+
+#else
+    return 0;
+#endif
+}
+
+""" % (arch)
+        
+        elif str(domarch.attributes["type"].value) == "all":
+            arch = str(domarch.attributes["name"].value);
+            tempstring = tempstring + """\
+int i_can_has_%s () {
+    return 1;
+}
+
+""" % (arch)
+        else:
+            arch = str(domarch.attributes["name"].value);
+            tempstring = tempstring + """\
+int i_can_has_%s () {
+    return 0;
+}
+
+""" % (arch)
+    
+    tempstring = tempstring + "void volk_cpu_init() {\n";
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        tempstring = tempstring + "    volk_cpu.has_" + arch + " = &i_can_has_" + arch + ";\n"
+    tempstring = tempstring + "}\n\n"
+
+    tempstring = tempstring + "unsigned int volk_get_lvarch() {\n";
+    tempstring = tempstring + "    unsigned int retval = 0;\n"
+    tempstring = tempstring + "    volk_cpu_init();\n"
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        tempstring = tempstring + "    retval += volk_cpu.has_" + arch + "() << LV_" + arch.swapcase() + ";\n"
+    tempstring = tempstring + "    return retval;\n"
+    tempstring = tempstring + "}\n\n"
+
+    return tempstring;
+
+    
+            
+        
+
+                
+                
diff --git a/volk/include/volk/make_cpuid_h.py b/volk/gen/make_cpuid_h.py
index cd3da2455..4fe5c4e07 100644
--- a/volk/include/volk/make_cpuid_h.py
+++ b/volk/gen/make_cpuid_h.py
@@ -21,14 +21,14 @@
 # 
 
 from xml.dom import minidom
-from emit_omnilog import *
 
 def make_cpuid_h(dom) :
     tempstring = "";
     tempstring = tempstring +'/*this file is auto generated by volk_register.py*/';
     tempstring = tempstring +'\n#ifndef INCLUDED_VOLK_CPU_H';
     tempstring = tempstring +'\n#define INCLUDED_VOLK_CPU_H\n\n';
-    tempstring = tempstring + emit_prolog();
+    tempstring = tempstring + "#include <volk/volk_common.h>\n\n";
+    tempstring = tempstring + '__VOLK_DECL_BEGIN\n';
     tempstring = tempstring + '\n'
 
     tempstring = tempstring + "struct VOLK_CPU {\n"
@@ -42,7 +42,7 @@ def make_cpuid_h(dom) :
     tempstring = tempstring + "unsigned int volk_get_lvarch ();\n"
 
     tempstring = tempstring + "\n";
-    tempstring = tempstring + emit_epilog();
+    tempstring = tempstring + "__VOLK_DECL_END\n";
     tempstring = tempstring + "#endif /*INCLUDED_VOLK_CPU_H*/\n"
     
     return tempstring;
diff --git a/volk/gen/make_each_machine_c.py b/volk/gen/make_each_machine_c.py
new file mode 100644
index 000000000..44e2ef3f2
--- /dev/null
+++ b/volk/gen/make_each_machine_c.py
@@ -0,0 +1,86 @@
+#
+# Copyright 2010-2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from volk_regexp import *
+import string
+
+def _make_each_machine_struct(machine_name, archs, functions, fcountlist, taglist, alignment):
+
+    #make the machine fcountlist and taglist a subset given the archs list
+    machine_fcountlists = list()
+    machine_taglists = list()
+    for i in range(len(fcountlist)):
+        machine_fcountlist = list()
+        machine_taglist = list()
+        for j in range(len(fcountlist[i])):
+            if len(set(archs).intersection(map(str.lower, fcountlist[i][j]))) == len(fcountlist[i][j]):
+                machine_fcountlist.append(fcountlist[i][j])
+                machine_taglist.append(taglist[i][j])
+        machine_fcountlists.append(machine_fcountlist)
+        machine_taglists.append(machine_taglist)
+
+    #create the volk machine struct for this machine file
+    tempstring = ""
+    tempstring += "struct volk_machine volk_machine_" + machine_name + " = {\n"
+    tempstring += "    " + ' | '.join(["(1 << LV_" + arch.swapcase() + ")" for arch in archs]) + ",\n"
+    tempstring += "    \"%s\",\n"%machine_name
+    tempstring += "    %s,\n"%alignment
+
+    #fill in the description for each function
+    for i in range(len(functions)):
+        tempstring += "    \"%s\",\n"%functions[i]
+        tempstring += "    {%s},\n"%(', '.join(['"%s"'%tag for tag in machine_taglists[i]]))
+        tempstring += "    {%s},\n"%(', '.join([' | '.join(['(1 << LV_%s)'%fc for fc in fcount]) for fcount in machine_fcountlists[i]]))
+        tempstring += "    {%s},\n"%(', '.join(['%s_%s'%(functions[i], tag) for tag in machine_taglists[i]]))
+        tempstring += "    %d,\n"%len(machine_taglists[i])
+
+    tempstring = strip_trailing(tempstring, ",")
+    tempstring += "};\n"
+    return tempstring
+
+def make_each_machine_c(machine_name, archs, functions, fcountlist, taglist, alignment):
+    tempstring = r"""
+// This file is automatically generated by make_each_machine_c.py.
+// Do not edit this file.
+"""
+    for arch in archs:
+        tempstring += "#define LV_HAVE_" + arch.swapcase() + " 1\n"
+    
+    tempstring += """
+#include <volk/volk_common.h>
+#include "volk_machines.h"
+#include <volk/volk_config_fixed.h>
+
+"""
+    for func in functions:
+        tempstring += "#include <volk/" + func + ".h>\n"
+    tempstring += "\n\n"
+
+    tempstring += """
+#ifdef LV_HAVE_ORC
+%s
+#else
+%s
+#endif
+"""%(
+    _make_each_machine_struct(machine_name, archs+["orc"], functions, fcountlist, taglist, alignment),
+    _make_each_machine_struct(machine_name, archs, functions, fcountlist, taglist, alignment)
+)
+
+    return tempstring
+
+
diff --git a/volk/include/volk/make_environment_init_c.py b/volk/gen/make_environment_init_c.py
index e06c7f246..263d5bcd1 100644
--- a/volk/include/volk/make_environment_init_c.py
+++ b/volk/gen/make_environment_init_c.py
@@ -4,13 +4,12 @@ def make_environment_init_c(dom) :
     tempstring = "";
     tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
     tempstring = tempstring + "#include<volk/volk_environment_init.h>\n"
-    tempstring = tempstring + "#include<volk/volk_config.h>\n"
     for domarch in dom:
         arch = str(domarch.attributes["name"].value);
         incs = domarch.getElementsByTagName("include");
         for inc in incs:
             my_inc = str(inc.firstChild.data);
-            tempstring = tempstring + "#if LV_HAVE_" + arch.swapcase() + "\n";
+            tempstring = tempstring + "#ifdef LV_HAVE_" + arch.swapcase() + "\n";
             tempstring = tempstring + "#include<" + my_inc + ">\n";
             tempstring = tempstring + "#endif\n"
     tempstring = tempstring + '\n\n';
@@ -21,7 +20,7 @@ def make_environment_init_c(dom) :
         envs = domarch.getElementsByTagName("environment");
         for env in envs:
             cmd = str(env.firstChild.data);
-            tempstring = tempstring + "#if LV_HAVE_" + arch.swapcase() + "\n";
+            tempstring = tempstring + "#ifdef LV_HAVE_" + arch.swapcase() + "\n";
             tempstring = tempstring + "        " + cmd + "\n";
             tempstring = tempstring + "#endif\n"     
     
diff --git a/volk/include/volk/make_environment_init_h.py b/volk/gen/make_environment_init_h.py
index 77a841a24..655d73f54 100644
--- a/volk/include/volk/make_environment_init_h.py
+++ b/volk/gen/make_environment_init_h.py
@@ -1,5 +1,4 @@
 from xml.dom import minidom
-from emit_omnilog import *
 
 def make_environment_init_h() :
     tempstring = "";
@@ -7,9 +6,10 @@ def make_environment_init_h() :
     tempstring = tempstring + "#ifndef INCLUDE_LIBVECTOR_ENVIRONMENT_INIT_H\n";
     tempstring = tempstring + "#define INCLUDE_LIBVECTOR_ENVIRONMENT_INIT_H\n";
     tempstring = tempstring + "\n";
-    tempstring = tempstring + emit_prolog();
+    tempstring = tempstring + "#include <volk/volk_common.h>\n\n";
+    tempstring = tempstring + "__VOLK_DECL_BEGIN\n";
     tempstring = tempstring + "void volk_environment_init();\n";
-    tempstring = tempstring + emit_epilog();
+    tempstring = tempstring + "__VOLK_DECL_END\n";
     tempstring = tempstring + "#endif\n"
     return tempstring;
             
diff --git a/volk/gen/make_h.py b/volk/gen/make_h.py
new file mode 100644
index 000000000..354e57258
--- /dev/null
+++ b/volk/gen/make_h.py
@@ -0,0 +1,38 @@
+from xml.dom import minidom
+from volk_regexp import *
+
+def make_h(funclist, arched_arglist) :
+    tempstring = "";
+    tempstring = tempstring + '/*this file is auto generated by make_h.py*/\n';
+
+    tempstring = tempstring + '\n#ifndef INCLUDED_VOLK_RUNTIME';
+    tempstring = tempstring + '\n#define INCLUDED_VOLK_RUNTIME';
+    tempstring = tempstring + '\n\n#include<volk/volk_typedefs.h>\n';
+    tempstring = tempstring + '#include<volk/volk_config_fixed.h>\n';
+    tempstring = tempstring + '#include<volk/volk_common.h>\n';
+    tempstring = tempstring + '#include<volk/volk_complex.h>\n';
+    tempstring = tempstring + '__VOLK_DECL_BEGIN\n';
+
+    tempstring = tempstring + '\n';
+
+    tempstring += """
+struct volk_func_desc {
+     const char **indices;
+     const int *arch_defs;
+     const int n_archs;
+};
+
+VOLK_API unsigned int volk_get_alignment(void);
+
+"""
+    for i in range(len(funclist)):
+        tempstring += "extern VOLK_API " + replace_volk.sub("p", funclist[i]) + " " + funclist[i] + ";\n"
+        tempstring += "extern VOLK_API void %s_manual%s;\n" % (funclist[i], arched_arglist[i])
+        tempstring = strip_trailing(tempstring, " {")
+        tempstring += "extern VOLK_API struct volk_func_desc %s_get_func_desc(void);\n" % (funclist[i])
+
+    tempstring = tempstring + '__VOLK_DECL_END\n';
+    tempstring = tempstring + "#endif /*INCLUDED_VOLK_RUNTIME*/\n";
+
+    return tempstring;
+    
diff --git a/volk/gen/make_machines_c.py b/volk/gen/make_machines_c.py
new file mode 100644
index 000000000..a7ab63d6e
--- /dev/null
+++ b/volk/gen/make_machines_c.py
@@ -0,0 +1,41 @@
+#
+# Copyright 2010-2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from volk_regexp import *
+
+def make_machines_c(machines):
+    tempstring = r"""
+// This file is automatically generated by make_machines_c.py.
+// Do not edit this file.
+
+#include <volk/volk_common.h>
+#include <volk/volk_typedefs.h>
+#include "volk_machines.h"
+
+struct volk_machine *volk_machines[] = {
+"""
+    for machine in machines:
+        tempstring += """#if LV_MACHINE_""" + machine.swapcase() + "\n"
+        tempstring += "&volk_machine_" + machine
+        tempstring += ","
+        tempstring += "\n#endif\n"
+    
+    tempstring += r"""
+};
+unsigned int n_volk_machines = sizeof(volk_machines)/sizeof(*volk_machines);
+"""
+    return tempstring
diff --git a/volk/gen/make_machines_h.py b/volk/gen/make_machines_h.py
new file mode 100644
index 000000000..a48caa89c
--- /dev/null
+++ b/volk/gen/make_machines_h.py
@@ -0,0 +1,59 @@
+#
+# Copyright 2010-2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from volk_regexp import *
+
+def make_machines_h(functions, machines, archs):
+    tempstring = r"""
+// This file is automatically generated by make_machines_h.py.
+// Do not edit this file.
+
+#ifndef INCLUDED_LIBVOLK_MACHINES_H
+#define INCLUDED_LIBVOLK_MACHINES_H
+
+#include <volk/volk_common.h>
+#include <volk/volk_typedefs.h>
+
+__VOLK_DECL_BEGIN
+
+struct volk_machine {
+   const unsigned int caps; //capabilities (i.e., archs compiled into this machine, in the volk_get_lvarch format)
+   const char *name;
+   const unsigned int alignment; //the maximum byte alignment required for functions in this library
+"""
+    for function in functions:
+        tempstring += "    const char *%s_name;\n"%function
+        tempstring += "    const char *%s_indices[%d];\n"%(function, len(archs))
+        tempstring += "    const int %s_arch_defs[%d];\n"%(function, len(archs))
+        tempstring += "    const %s %s_archs[%d];\n"%(replace_volk.sub("p", function), function, len(archs))
+        tempstring += "    const int %s_n_archs;\n"%function
+    
+    tempstring += r"""};
+    
+"""
+    for machine in machines:
+        tempstring += """#if LV_MACHINE_""" + machine.swapcase() + "\n"
+        tempstring += "extern struct volk_machine volk_machine_" + machine + ";\n"
+        tempstring += """#endif\n"""
+    
+    tempstring += r"""
+
+__VOLK_DECL_END
+
+#endif //INCLUDED_LIBVOLK_MACHINES_H"""
+
+    return tempstring
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py
new file mode 100644
index 000000000..f843b4413
--- /dev/null
+++ b/volk/gen/make_makefile_am.py
@@ -0,0 +1,123 @@
+#
+# Copyright 2010-2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from xml.dom import minidom
+
+def make_makefile_am(dom, machines, archflags_dict):
+    tempstring = r"""
+# This file is automatically generated by make_makefile_am.py.
+# Do not edit this file.
+    
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
+	-I$(top_srcdir)/include \
+	-I$(top_gendir)/include \
+	-Dvolk_EXPORTS \
+	-fvisibility=hidden \
+	$(WITH_INCLUDES)
+
+lib_LTLIBRARIES = \
+	libvolk.la
+
+EXTRA_DIST = \
+	volk_rank_archs.h 	\
+	gcc_x86_cpuid.h
+
+# ----------------------------------------------------------------
+#                      The main library
+# ----------------------------------------------------------------
+
+libvolk_la_SOURCES = 	\
+	$(platform_CODE) 	\
+	$(top_gendir)/lib/volk.c			\
+	$(top_gendir)/lib/volk_cpu.c 		\
+	volk_rank_archs.c	\
+	volk_prefs.c	\
+	$(top_gendir)/lib/volk_machines.c
+
+if LV_HAVE_ORC
+volk_orc_CFLAGS = -DLV_HAVE_ORC=1
+volk_orc_LDFLAGS = $(ORC_LDFLAGS) -lorc-0.4
+volk_orc_LIBADD = ../orc/libvolk_orc.la
+else
+volk_orc_CFLAGS = 
+volk_orc_LDFLAGS =
+volk_orc_LIBADD = 
+endif
+
+libvolk_la_CPPFLAGS = $(AM_CPPFLAGS) $(volk_orc_CFLAGS)
+libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS)
+libvolk_la_LIBADD = $(volk_orc_LIBADD)
+
+noinst_LTLIBRARIES = 
+    
+"""
+
+    #here be dragons
+    for machine_name in machines:
+        tempstring += "if LV_MACHINE_" + machine_name.swapcase() + "\n"
+        tempstring += "libvolk_" + machine_name + "_la_SOURCES = $(top_gendir)/lib/volk_machine_" + machine_name + ".c\n"
+        tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_srcdir)/include -I$(top_gendir)/include $(volk_orc_CFLAGS) "
+        for arch in machines[machine_name]:
+            if archflags_dict[arch] != "none":
+                tempstring += "-" + archflags_dict[arch] + " "
+                
+        tempstring += "\nnoinst_LTLIBRARIES += libvolk_" + machine_name + ".la "
+        tempstring += "\nlibvolk_la_LIBADD += libvolk_" + machine_name + ".la\n"
+        tempstring += "libvolk_la_CPPFLAGS += -DLV_MACHINE_" + machine_name.swapcase() + " \n"
+        tempstring += "endif\n"
+
+
+    tempstring += r"""
+
+# ----------------------------------------------------------------
+#        The QA library.  Note libvolk.la in LIBADD
+# ----------------------------------------------------------------
+#libvolk_qa_la_SOURCES = \
+#	qa_utils.cc
+
+#libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lboost
+
+#libvolk_qa_la_LIBADD = \
+#	libvolk.la \
+#	libvolk_runtime.la
+
+# ----------------------------------------------------------------
+# headers that don't get installed
+# ----------------------------------------------------------------
+noinst_HEADERS = \
+	$(top_gendir)/lib/volk_init.h \
+	$(top_gendir)/lib/volk_machines.h \
+	$(top_gendir)/lib/volk_environment_init.h \
+	qa_utils.h
+
+# ----------------------------------------------------------------
+# Our test program
+# ----------------------------------------------------------------
+noinst_PROGRAMS = \
+	testqa
+
+testqa_SOURCES = testqa.cc qa_utils.cc
+testqa_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN $(AM_CPPFLAGS)
+testqa_LDFLAGS = $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+testqa_LDADD  = \
+	libvolk.la
+"""
+
+
+    return tempstring
diff --git a/volk/include/volk/make_proccpu_sim.py b/volk/gen/make_proccpu_sim.py
index 029dacfcc..029dacfcc 100644
--- a/volk/include/volk/make_proccpu_sim.py
+++ b/volk/gen/make_proccpu_sim.py
diff --git a/volk/gen/make_set_simd.py b/volk/gen/make_set_simd.py
new file mode 100644
index 000000000..5a848e59e
--- /dev/null
+++ b/volk/gen/make_set_simd.py
@@ -0,0 +1,166 @@
+#
+# Copyright 2010 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from xml.dom import minidom
+
+def make_set_simd(dom, machines) :
+    tempstring = "";
+    tempstring = tempstring +'dnl this file is auto generated by volk_register.py\n\n';
+
+    tempstring = tempstring +'\ndnl define arch checks\n';
+    for domarch in dom:
+        if str(domarch.attributes["type"].value) != "all":
+            arch = str(domarch.attributes["name"].value);
+            flag = domarch.getElementsByTagName("flag");
+            flag = str(flag[0].firstChild.data);
+            tempstring = tempstring + "AC_DEFUN([_TRY_ADD_" + arch.swapcase() + "],\n";
+            tempstring = tempstring + "[\n";
+            tempstring = tempstring + "  LF_CHECK_CC_FLAG([-" + flag + "])\n";
+            tempstring = tempstring + "  LF_CHECK_CXX_FLAG([-" + flag + "])\n";
+            tempstring = tempstring + "])\n";
+
+    tempstring = tempstring +'\ndnl main set_simd_flags\n';
+    tempstring = tempstring + "AC_DEFUN([LV_SET_SIMD_FLAGS],\n";
+    tempstring = tempstring + "[\n";
+    #tempstring = tempstring + "  AC_REQUIRE([GR_SET_MD_CPU])\n";
+    tempstring = tempstring + "  AC_SUBST(LV_CXXFLAGS)\n";
+    tempstring = tempstring + "  indCC=no\n";
+    tempstring = tempstring + "  indCXX=no\n";
+    tempstring = tempstring + "  indLV_ARCH=no\n";
+    tempstring = tempstring + "  AC_ARG_WITH(lv_arch,\n";
+    tempstring = tempstring + "    AC_HELP_STRING([--with-lv_arch=ARCH],[set volk hardware speedups as space separated string with elements from the following list(";
+    
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        tempstring = tempstring + arch + ", "
+    tempstring = tempstring[0:len(tempstring) - 2];
+        
+    tempstring = tempstring + ")]),\n";
+    tempstring = tempstring + "      [cf_with_lv_arch=\"$withval\"],\n";
+    tempstring = tempstring + "      [cf_with_lv_arch=\"\"])\n";
+    if str(domarch.attributes["type"].value) == "all":
+        arch = str(domarch.attributes["name"].value);    
+        tempstring = tempstring + "  AC_DEFINE(LV_MAKE_" + arch.swapcase() + ", 1, [always set "+ arch + "!])\n";
+    tempstring = tempstring + "  ADDONS=\"\"\n";
+    tempstring = tempstring + "  BUILT_ARCHS=\"\"\n";
+    #tempstring = tempstring + "  _MAKE_FAKE_PROCCPU\n";
+    tempstring = tempstring + "  OVERRULE_FLAG=\"no\"\n";
+    tempstring = tempstring + "  if test -z \"$cf_with_lv_arch\"; then\n";
+    tempstring = tempstring + "    cf_with_lv_arch=\"";
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        tempstring = tempstring + arch + " ";
+    tempstring = tempstring[0:-1] + "\"\n";
+    tempstring = tempstring + "    OVERRULE_FLAG=\"yes\"\n";
+    tempstring = tempstring + "  fi\n";
+    
+    tempstring = tempstring +'\ndnl init LV_MAKE_XXX and then try to add archs\n';
+    for domarch in dom:
+        if str(domarch.attributes["type"].value) != "all":
+            arch = str(domarch.attributes["name"].value);
+            tempstring = tempstring + "  LV_MAKE_" + arch.swapcase() + "=no\n";
+
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        atype = str(domarch.attributes["type"].value);
+        if atype != "all":
+            tempstring = tempstring + "  _TRY_ADD_" + arch.swapcase() + "\n";
+
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        atype = str(domarch.attributes["type"].value);
+        tempstring = tempstring +'\ndnl add in flags for arch ' + arch + '\n';
+        overrule = domarch.getElementsByTagName("overrule");
+        if overrule:
+            overrule = str(overrule[0].firstChild.data);
+        else:
+            overrule = "";
+        overrule_val = domarch.getElementsByTagName("overrule_val");
+        if overrule_val:
+            overrule_val = str(overrule_val[0].firstChild.data);
+        else:
+            overrule_val = "";
+        flag = domarch.getElementsByTagName("flag");
+        flag = str(flag[0].firstChild.data);
+        if atype != "all":
+            tempstring = tempstring + "  for i in $lf_CXXFLAGS\n"
+            tempstring = tempstring + "  do\n"
+            tempstring = tempstring + "    if test \"X$i\" = X-" + flag +"; then\n";
+            tempstring = tempstring + "      indCXX=yes\n";
+            tempstring = tempstring + "    fi\n"
+            tempstring = tempstring + "  done\n"
+            tempstring = tempstring + "  for i in $lf_CFLAGS\n"
+            tempstring = tempstring + "  do\n"
+            tempstring = tempstring + "    if test \"X$i\" = X-" + flag +"; then\n";
+            tempstring = tempstring + "      indCC=yes\n";
+            tempstring = tempstring + "    fi\n"
+            tempstring = tempstring + "  done\n"
+            tempstring = tempstring + "  for i in $cf_with_lv_arch\n"
+            tempstring = tempstring + "  do\n"
+            tempstring = tempstring + "    if test \"X$i\" = X" + arch + "; then\n";
+            tempstring = tempstring + "      indLV_ARCH=yes\n"
+            tempstring = tempstring + "    fi\n"
+            tempstring = tempstring + "  done\n"
+            tempstring = tempstring + "  if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
+            tempstring = tempstring + "    indLV_ARCH=no\n"
+            tempstring = tempstring + "  fi\n"
+            
+            tempstring = tempstring + "  if test \"$indCC\" == \"yes\" && test \"$indCXX\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"        
+            
+            #tempstring = tempstring + "    ADDONS=\"${ADDONS} -" + flag + "\"\n";
+            tempstring = tempstring + "    BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
+            tempstring = tempstring + "    LV_MAKE_" + arch.swapcase() + "=yes\n";
+            tempstring = tempstring + "  fi\n"
+            tempstring = tempstring + "  indCC=no\n"
+            tempstring = tempstring + "  indCXX=no\n"
+            tempstring = tempstring + "  indLV_ARCH=no\n"
+        else:
+            tempstring = tempstring + "  for i in $cf_with_lv_arch\n"
+            tempstring = tempstring + "  do\n"
+            tempstring = tempstring + "    if test \"X$i\" = X" + arch + "; then\n";
+            tempstring = tempstring + "      indLV_ARCH=yes\n"
+            tempstring = tempstring + "    fi\n"
+            tempstring = tempstring + "  done\n"
+            tempstring = tempstring + "  if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
+            tempstring = tempstring + "    indLV_ARCH=no\n"
+            tempstring = tempstring + "  fi\n"
+            tempstring = tempstring + "  if test \"$indLV_ARCH\" == \"yes\"; then\n"        
+            tempstring = tempstring + "    LV_MAKE_" + arch.swapcase() + "=yes\n";
+            tempstring = tempstring + "    BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
+            tempstring = tempstring + "  fi\n"
+            tempstring = tempstring + "  indLV_ARCH=no\n"
+            
+
+    for domarch in dom:
+        arch = str(domarch.attributes["name"].value);
+        tempstring = tempstring + "  AM_CONDITIONAL(LV_MAKE_" + arch.swapcase() + ", test \"$LV_MAKE_" + arch.swapcase() + "\" == \"yes\")\n";
+    
+    tempstring += "\n"
+    #now we can define the machines we're compiling
+    for machine_name in machines:
+        tempstring += "  AM_CONDITIONAL(LV_MACHINE_" + machine_name.swapcase() + ", "
+        marchlist = machines[machine_name]
+        for march in marchlist:
+            tempstring += "test \"$LV_MAKE_" + march.swapcase() + "\" == \"yes\" && "
+            
+        tempstring += "test true)\n" #just so we don't have to detect the last one in the group, i know
+    tempstring = tempstring + "  LV_CXXFLAGS=\"${LV_CXXFLAGS} ${ADDONS}\"\n"
+    tempstring = tempstring + "])\n"
+   
+    return tempstring;
+
+        
diff --git a/volk/include/volk/make_typedefs.py b/volk/gen/make_typedefs.py
index fe81cb2b0..8f9f2b55e 100644
--- a/volk/include/volk/make_typedefs.py
+++ b/volk/gen/make_typedefs.py
@@ -16,7 +16,7 @@ def make_typedefs(funclist, retlist, my_argtypelist) :
     tempstring = tempstring + '\n';
 
     for i in range(len(funclist)): 
-        tempstring = tempstring + "typedef " + retlist[i] +" (*" + replace_volk.sub("p", funclist[i]) + ")(" + my_argtypelist[i] + ");\n\n";
+        tempstring = tempstring + "typedef " + retlist[i] +" (*" + replace_volk.sub("p", funclist[i]) + ")(" + my_argtypelist[i] + ");\n";
 
     tempstring = tempstring + "#endif /*INCLUDED_VOLK_TYPEDEFS*/\n";
 
diff --git a/volk/include/volk/volk_regexp.py b/volk/gen/volk_regexp.py
index 7b695cb3b..b83ce5206 100644
--- a/volk/include/volk/volk_regexp.py
+++ b/volk/gen/volk_regexp.py
@@ -1,4 +1,5 @@
 import re
+import string
 
 remove_after_underscore = re.compile("_.*");
 space_remove = re.compile(" ");
@@ -6,3 +7,8 @@ leading_space_remove = re.compile("^ *");
 replace_arch = re.compile(", const char\* arch");
 replace_bracket = re.compile(" {");
 replace_volk = re.compile("volk");
+
+def strip_trailing(tostrip, stripstr):
+    lindex = tostrip.rfind(stripstr)
+    tostrip = tostrip[0:lindex] + string.replace(tostrip[lindex:len(tostrip)], stripstr, "");
+    return tostrip
diff --git a/volk/include/volk/volk_register.py b/volk/gen/volk_register.py
index bc8f959af..75e5eeb87 100755..100644
--- a/volk/include/volk/volk_register.py
+++ b/volk/gen/volk_register.py
@@ -1,50 +1,54 @@
 #! /usr/bin/env python
 
 import sys
+import os
 import re
 import string
 from xml.dom import minidom
 from volk_regexp import *
-from make_cpuid_x86_c import make_cpuid_x86_c
+from make_cpuid_c import make_cpuid_c
 from make_cpuid_h import make_cpuid_h
-from make_proccpu_sim import make_proccpu_sim
 from make_set_simd import make_set_simd
-from make_cpuid_generic_c import make_cpuid_generic_c
-from make_cpuid_powerpc_c import make_cpuid_powerpc_c
-from make_registry import make_registry
-from make_h import make_h
-from make_init_h import make_init_h
 from make_config_fixed import make_config_fixed
-from make_config_in import make_config_in
-from make_c import make_c
-from make_runtime_c import make_runtime_c
-from make_init_c import make_init_c
-from make_runtime import make_runtime
 from make_typedefs import make_typedefs
-from make_mktables import make_mktables
 from make_environment_init_c import make_environment_init_c
 from make_environment_init_h import make_environment_init_h
-
-outfile_set_simd = open("../../config/lv_set_simd_flags.m4", "w");
-outfile_reg = open("volk_registry.h", "w");
-outfile_h = open("volk.h", "w");
-outfile_c = open("../../lib/volk.c", "w");
-outfile_runtime = open("volk_runtime.h", "w");
-outfile_runtime_c = open("../../lib/volk_runtime.c", "w");
-outfile_typedefs = open("volk_typedefs.h", "w");
-outfile_init_h = open("../../lib/volk_init.h", "w");
-outfile_init_c = open("../../lib/volk_init.c", "w");
-outfile_cpu_h = open("volk_cpu.h", "w");
-outfile_cpu_x86_c = open("../../lib/volk_cpu_x86.c", "w");
-outfile_cpu_generic_c = open("../../lib/volk_cpu_generic.c", "w");
-outfile_cpu_powerpc_c = open("../../lib/volk_cpu_powerpc.c", "w");
-outfile_proccpu_sim = open("../../lib/volk_proccpu_sim.c", "w");
-outfile_config_in = open("../../volk_config.h.in", "w");
-outfile_config_fixed = open("volk_config_fixed.h", "w");
-outfile_mktables = open("../../lib/volk_mktables.c", "w");
-outfile_environment_c = open("../../lib/volk_environment_init.c", "w");
-outfile_environment_h = open("volk_environment_init.h", "w");
-infile = open("Makefile.am", "r");
+from make_makefile_am import make_makefile_am
+from make_machines_h import make_machines_h
+from make_machines_c import make_machines_c
+from make_each_machine_c import make_each_machine_c
+from make_c import make_c
+from make_h import make_h
+import copy
+
+#set srcdir and gendir
+srcdir = os.path.dirname(os.path.dirname(__file__))
+try: gendir = sys.argv[1]
+except: gendir = os.path.dirname(__file__)
+
+#ensure directories exist
+for dir in (
+    (os.path.join(gendir, 'include', 'volk')),
+    (os.path.join(gendir, 'lib')),
+    (os.path.join(gendir, 'config'))
+):
+    if not os.path.exists(dir): os.makedirs(dir)
+
+outfile_set_simd = open(os.path.join(gendir, "config/lv_set_simd_flags.m4"), "w")
+outfile_h = open(os.path.join(gendir, "include/volk/volk.h"), "w")
+outfile_c = open(os.path.join(gendir, "lib/volk.c"), "w")
+outfile_typedefs = open(os.path.join(gendir, "include/volk/volk_typedefs.h"), "w")
+outfile_init_h = open(os.path.join(gendir, "lib/volk_init.h"), "w")
+outfile_cpu_h = open(os.path.join(gendir, "include/volk/volk_cpu.h"), "w")
+outfile_cpu_c = open(os.path.join(gendir, "lib/volk_cpu.c"), "w")
+#outfile_config_in = open(os.path.join(gendir, "include/volk/volk_config.h.in"), "w")
+outfile_config_fixed = open(os.path.join(gendir, "include/volk/volk_config_fixed.h"), "w")
+outfile_environment_c = open(os.path.join(gendir, "lib/volk_environment_init.c"), "w")
+outfile_environment_h = open(os.path.join(gendir, "lib/volk_environment_init.h"), "w")
+outfile_makefile_am = open(os.path.join(gendir, "lib/Makefile.am"), "w")
+outfile_machines_h = open(os.path.join(gendir, "lib/volk_machines.h"), "w")
+outfile_machines_c = open(os.path.join(gendir, "lib/volk_machines.c"), "w")
+infile = open(os.path.join(srcdir, "include/volk/Makefile.am"), "r")
 
 
 mfile = infile.readlines();
@@ -55,7 +59,7 @@ functions = [];
 
 
 for line in mfile:
-    subline = re.search(".*_(a16|u)\.h.*", line);
+    subline = re.search(".*_(a|u)\.h.*", line);
     if subline:
         subsubline = re.search("(?<=volk_).*", subline.group(0));
         if subsubline:
@@ -70,14 +74,14 @@ datatypes = set(datatypes);
 for line in mfile:
     for dt in datatypes:
         if dt in line:
-            subline = re.search("(volk_" + dt +"_.*(a16|u).*\.h)", line);
+            subline = re.search("(volk_" + dt +"_.*(a|u).*\.h)", line);
             if subline:
                 
                 subsubline = re.search(".+(?=\.h)", subline.group(0));
                 functions.append(subsubline.group(0));
 
 archs = [];
-afile = minidom.parse("archs.xml");
+afile = minidom.parse(os.path.join(srcdir, "gen/archs.xml"))
 filearchs = afile.getElementsByTagName("arch");
 for filearch in filearchs:
     archs.append(str(filearch.attributes["name"].value));
@@ -86,8 +90,18 @@ for arch in archs:
     a_var = re.search("^\$", arch);
     if a_var:
         archs.remove(arch);
+        
+        
 
+archflags_dict = {}
+for filearch in filearchs:
+    archflags_dict[str(filearch.attributes["name"].value)] = str(filearch.getElementsByTagName("flag")[0].firstChild.data)
 
+archalign_dict = {}
+for filearch in filearchs:
+    alignelem = filearch.getElementsByTagName("alignment")
+    if(alignelem):
+        archalign_dict[str(filearch.attributes["name"].value)] = int(alignelem[0].firstChild.data)
 
 archs_or = "("
 for arch in archs:
@@ -95,7 +109,44 @@ for arch in archs:
 archs_or = archs_or[0:len(archs_or)-1];
 archs_or = archs_or + ")";
 
-    
+#get machine list and parse to a list of machines, each with a list of archs (none of this DOM crap)
+machine_str_dict = {}
+mfile = minidom.parse(os.path.join(srcdir, "gen/machines.xml"))
+filemachines = mfile.getElementsByTagName("machine")
+
+for filemachine in filemachines:
+    machine_str_dict[str(filemachine.attributes["name"].value)] = str(filemachine.getElementsByTagName("archs")[0].firstChild.data).split()
+
+#all right now you have a dict of arch lists
+#next we expand it
+#this is an expanded list accounting for the OR syntax
+#TODO: make this work for multiple "|" machines
+machines = {}
+already_done = False
+for machine_name in machine_str_dict:
+    already_done = False
+    marchlist = machine_str_dict[machine_name]
+    for march in marchlist:
+        or_marchs = march.split("|")
+        if len(or_marchs) > 1:
+            marchlist.remove(march)
+            for or_march in or_marchs:
+                tempmarchlist = copy.deepcopy(marchlist)
+                tempmarchlist.append(or_march)
+                machines[machine_name + "_" + or_march] = tempmarchlist
+                already_done = True
+
+    if not already_done:
+        machines[machine_name] = marchlist
+
+#get the maximum alignment for all archs in a machine
+machine_alignment_dict = {}
+for machine in machines:
+    machine_alignment_dict[machine] = max((archalign_dict.get(k, 1)) for k in machines[machine])
+
+#for machine in machine_alignment_dict:
+#    print machine + ": %d" % machine_alignment_dict[machine]
+
 taglist = [];
 fcountlist = [];
 arched_arglist = [];
@@ -105,13 +156,13 @@ my_argtypelist = [];
 for func in functions:
     tags = [];
     fcount = [];
-    infile_source = open(func + ".h");
+    infile_source = open(os.path.join(srcdir, 'include', 'volk', func + ".h"))
     begun_name = 0;
     begun_paren = 0;
     sourcefile = infile_source.readlines();
     infile_source.close();
     for line in sourcefile:
-
+#FIXME: make it work for multiple #if define()s
         archline = re.search("^\#if.*?LV_HAVE_" + archs_or + ".*", line);
         if archline:
             arch = archline.group(0);
@@ -219,60 +270,39 @@ for func in functions:
     fcountlist.append(fcount);
     taglist.append(tags);               
 
-outfile_mktables.write(make_mktables(functions));
-outfile_mktables.close();
-
 
 outfile_cpu_h.write(make_cpuid_h(filearchs));
 outfile_cpu_h.close();
 
-outfile_cpu_x86_c.write(make_cpuid_x86_c(filearchs));
-outfile_cpu_x86_c.close();
-
-outfile_proccpu_sim.write(make_proccpu_sim(filearchs));
-outfile_proccpu_sim.close();
+outfile_cpu_c.write(make_cpuid_c(filearchs));
+outfile_cpu_c.close();
 
-outfile_set_simd.write(make_set_simd(filearchs));
+outfile_set_simd.write(make_set_simd(filearchs, machines));
 outfile_set_simd.close();
 
-outfile_cpu_generic_c.write(make_cpuid_generic_c(filearchs)); 
-outfile_cpu_generic_c.close();
-
-outfile_cpu_powerpc_c.write(make_cpuid_powerpc_c(filearchs));
-outfile_cpu_powerpc_c.close();
-
-outfile_config_in.write(make_config_in(filearchs));
-outfile_config_in.close();
-    
-outfile_reg.write(make_registry(filearchs, functions, fcountlist));
-outfile_reg.close();
-
-outfile_h.write(make_h(functions, arched_arglist, retlist));
-outfile_h.close();  
-
-outfile_init_h.write(make_init_h(functions, arched_arglist, retlist));
-outfile_init_h.close();
-
 outfile_config_fixed.write(make_config_fixed(filearchs));
 outfile_config_fixed.close();
 
-outfile_c.write( make_c(functions, taglist, arched_arglist, retlist, my_arglist, fcountlist));
-outfile_c.close();
+outfile_typedefs.write(make_typedefs(functions, retlist, my_argtypelist));
+outfile_typedefs.close();
 
-outfile_runtime_c.write(make_runtime_c(functions, taglist, arched_arglist, retlist, my_arglist, fcountlist));
-outfile_runtime_c.close();
+outfile_makefile_am.write(make_makefile_am(filearchs, machines, archflags_dict))
+outfile_makefile_am.close()
 
-outfile_init_c.write(make_init_c(functions, filearchs));
-outfile_init_c.close();
+outfile_machines_h.write(make_machines_h(functions, machines, archs))
+outfile_machines_h.close()
 
-outfile_runtime.write(make_runtime(functions));
-outfile_runtime.close();
+outfile_machines_c.write(make_machines_c(machines))
+outfile_machines_c.close()
 
-outfile_typedefs.write(make_typedefs(functions, retlist, my_argtypelist));
-outfile_typedefs.close();
+outfile_c.write(make_c(machines, archs, functions, arched_arglist, my_arglist))
+outfile_c.close()
 
-outfile_environment_c.write(make_environment_init_c(filearchs));
-outfile_environment_c.close();
+outfile_h.write(make_h(functions, arched_arglist))
+outfile_h.close()
 
-outfile_environment_h.write(make_environment_init_h());
-outfile_environment_h.close();
+for machine in machines:
+    machine_c_filename = os.path.join(gendir, "lib/volk_machine_" + machine + ".c")
+    outfile_machine_c = open(machine_c_filename, "w")
+    outfile_machine_c.write(make_each_machine_c(machine, machines[machine], functions, fcountlist, taglist, machine_alignment_dict[machine]))
+    outfile_machine_c.close()
diff --git a/volk/include/volk/.gitignore b/volk/include/volk/.gitignore
index be8358f3a..b336cc7ce 100644
--- a/volk/include/volk/.gitignore
+++ b/volk/include/volk/.gitignore
@@ -1,20 +1,2 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
 /Makefile
 /Makefile.in
-/volk.h
-/volk_config.h
-/volk_config_fixed.h
-/volk_cpu.h
-/volk_environment_init.h
-/volk_registry.h
-/volk_runtime.h
-/volk_tables.h
-/volk_typedefs.h
-/volk_mktables
diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am
index 7a5edd624..b7da9b37c 100644
--- a/volk/include/volk/Makefile.am
+++ b/volk/include/volk/Makefile.am
@@ -20,142 +20,104 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_CPPFLAGS) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
 	$(LV_CXXFLAGS) $(WITH_INCLUDES)
 
 volkincludedir = $(prefix)/include/volk
 
-BUILT_SOURCES: \
-	volk_config.h \
-	volk_tables.h
-
 volkinclude_HEADERS = \
 	volk_complex.h \
 	volk_common.h \
-	volk_config_fixed.h \
-	volk_runtime.h \
-	volk_config.h \
-	volk_tables.h \
-	volk_typedefs.h \
-	volk_registry.h \
-	volk.h \
-	volk_cpu.h \
-	volk_environment_init.h \
-	volk_16i_x5_add_quad_16i_x4_a16.h \
-	volk_16i_branch_4_state_8_a16.h \
-	volk_16ic_deinterleave_16i_x2_a16.h \
-	volk_16ic_s32f_deinterleave_32f_x2_a16.h \
-	volk_16ic_deinterleave_real_16i_a16.h \
-	volk_16ic_s32f_deinterleave_real_32f_a16.h \
-	volk_16ic_deinterleave_real_8i_a16.h \
-	volk_16ic_magnitude_16i_a16.h \
-	volk_16ic_s32f_magnitude_32f_a16.h \
-	volk_16i_s32f_convert_32f_a16.h \
+	volk_prefs.h \
+	$(top_gendir)/include/volk/volk_config_fixed.h \
+	$(top_gendir)/include/volk/volk_typedefs.h \
+	$(top_gendir)/include/volk/volk.h \
+	$(top_gendir)/include/volk/volk_cpu.h \
+	volk_16i_x5_add_quad_16i_x4_a.h \
+	volk_16i_branch_4_state_8_a.h \
+	volk_16ic_deinterleave_16i_x2_a.h \
+	volk_16ic_s32f_deinterleave_32f_x2_a.h \
+	volk_16ic_deinterleave_real_16i_a.h \
+	volk_16ic_s32f_deinterleave_real_32f_a.h \
+	volk_16ic_deinterleave_real_8i_a.h \
+	volk_16ic_magnitude_16i_a.h \
+	volk_16ic_s32f_magnitude_32f_a.h \
+	volk_16i_s32f_convert_32f_a.h \
 	volk_16i_s32f_convert_32f_u.h \
-	volk_16i_convert_8i_a16.h \
+	volk_16i_convert_8i_a.h \
 	volk_16i_convert_8i_u.h \
-	volk_16i_max_star_16i_a16.h \
-	volk_16i_max_star_horizontal_16i_a16.h \
-	volk_16i_permute_and_scalar_add_a16.h \
-	volk_16i_x4_quad_max_star_16i_a16.h \
-	volk_16u_byteswap_a16.h \
-	volk_32f_accumulator_s32f_a16.h \
-	volk_32f_x2_add_32f_a16.h \
-	volk_32fc_32f_multiply_32fc_a16.h \
-	volk_32fc_s32f_power_32fc_a16.h \
-	volk_32f_s32f_calc_spectral_noise_floor_32f_a16.h \
-	volk_32fc_s32f_atan2_32f_a16.h \
-	volk_32fc_x2_conjugate_dot_prod_32fc_a16.h \
+	volk_16i_max_star_16i_a.h \
+	volk_16i_max_star_horizontal_16i_a.h \
+	volk_16i_permute_and_scalar_add_a.h \
+	volk_16i_x4_quad_max_star_16i_a.h \
+	volk_16u_byteswap_a.h \
+	volk_32f_accumulator_s32f_a.h \
+	volk_32f_x2_add_32f_a.h \
+	volk_32fc_32f_multiply_32fc_a.h \
+	volk_32fc_s32f_power_32fc_a.h \
+	volk_32f_s32f_calc_spectral_noise_floor_32f_a.h \
+	volk_32fc_s32f_atan2_32f_a.h \
+	volk_32fc_x2_conjugate_dot_prod_32fc_a.h \
 	volk_32fc_x2_conjugate_dot_prod_32fc_u.h \
-	volk_32fc_deinterleave_32f_x2_a16.h \
-	volk_32fc_deinterleave_64f_x2_a16.h \
-	volk_32fc_s32f_deinterleave_real_16i_a16.h \
-	volk_32fc_deinterleave_real_32f_a16.h \
-	volk_32fc_deinterleave_real_64f_a16.h \
-	volk_32fc_x2_dot_prod_32fc_a16.h \
-	volk_32fc_index_max_16u_a16.h \
-	volk_32fc_s32f_magnitude_16i_a16.h \
-	volk_32fc_magnitude_32f_a16.h \
-	volk_32fc_x2_multiply_32fc_a16.h \
-	volk_32f_s32f_convert_16i_a16.h \
+	volk_32fc_deinterleave_32f_x2_a.h \
+	volk_32fc_deinterleave_64f_x2_a.h \
+	volk_32fc_s32f_deinterleave_real_16i_a.h \
+	volk_32fc_deinterleave_real_32f_a.h \
+	volk_32fc_deinterleave_real_64f_a.h \
+	volk_32fc_x2_dot_prod_32fc_a.h \
+	volk_32fc_index_max_16u_a.h \
+	volk_32fc_s32f_magnitude_16i_a.h \
+	volk_32fc_magnitude_32f_a.h \
+	volk_32fc_x2_multiply_32fc_a.h \
+	volk_32f_s32f_convert_16i_a.h \
 	volk_32f_s32f_convert_16i_u.h \
-	volk_32f_s32f_convert_32i_a16.h \
+	volk_32f_s32f_convert_32i_a.h \
 	volk_32f_s32f_convert_32i_u.h \
-	volk_32f_convert_64f_a16.h \
+	volk_32f_convert_64f_a.h \
 	volk_32f_convert_64f_u.h \
-	volk_32f_s32f_convert_8i_a16.h \
+	volk_32f_s32f_convert_8i_a.h \
 	volk_32f_s32f_convert_8i_u.h \
-	volk_32fc_s32f_x2_power_spectral_density_32f_a16.h \
-	volk_32fc_s32f_power_spectrum_32f_a16.h \
-	volk_32fc_x2_square_dist_32f_a16.h \
-	volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16.h \
-	volk_32f_x2_divide_32f_a16.h \
-	volk_32f_x2_dot_prod_32f_a16.h \
+	volk_32fc_s32f_x2_power_spectral_density_32f_a.h \
+	volk_32fc_s32f_power_spectrum_32f_a.h \
+	volk_32fc_x2_square_dist_32f_a.h \
+	volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h \
+	volk_32f_x2_divide_32f_a.h \
+	volk_32f_x2_dot_prod_32f_a.h \
 	volk_32f_x2_dot_prod_32f_u.h \
-	volk_32f_s32f_32f_fm_detect_32f_a16.h \
-	volk_32f_index_max_16u_a16.h \
-	volk_32f_x2_s32f_interleave_16ic_a16.h \
-	volk_32f_x2_interleave_32fc_a16.h \
-	volk_32f_x2_max_32f_a16.h \
-	volk_32f_x2_min_32f_a16.h \
-	volk_32f_x2_multiply_32f_a16.h \
-	volk_32f_s32f_normalize_a16.h \
-	volk_32f_s32f_power_32f_a16.h \
-	volk_32f_sqrt_32f_a16.h \
-	volk_32f_s32f_stddev_32f_a16.h \
-	volk_32f_stddev_and_mean_32f_x2_a16.h \
-	volk_32f_x2_subtract_32f_a16.h \
-	volk_32f_x3_sum_of_poly_32f_a16.h \
-	volk_32i_x2_and_32i_a16.h \
-	volk_32i_s32f_convert_32f_a16.h \
+	volk_32f_s32f_32f_fm_detect_32f_a.h \
+	volk_32f_index_max_16u_a.h \
+	volk_32f_x2_s32f_interleave_16ic_a.h \
+	volk_32f_x2_interleave_32fc_a.h \
+	volk_32f_x2_max_32f_a.h \
+	volk_32f_x2_min_32f_a.h \
+	volk_32f_x2_multiply_32f_a.h \
+	volk_32f_s32f_normalize_a.h \
+	volk_32f_s32f_power_32f_a.h \
+	volk_32f_sqrt_32f_a.h \
+	volk_32f_s32f_stddev_32f_a.h \
+	volk_32f_stddev_and_mean_32f_x2_a.h \
+	volk_32f_x2_subtract_32f_a.h \
+	volk_32f_x3_sum_of_poly_32f_a.h \
+	volk_32i_x2_and_32i_a.h \
+	volk_32i_s32f_convert_32f_a.h \
 	volk_32i_s32f_convert_32f_u.h \
-	volk_32i_x2_or_32i_a16.h \
-	volk_32u_byteswap_a16.h \
-	volk_32u_popcnt_a16.h \
-	volk_64f_convert_32f_a16.h \
+	volk_32i_x2_or_32i_a.h \
+	volk_32u_byteswap_a.h \
+	volk_32u_popcnt_a.h \
+	volk_64f_convert_32f_a.h \
 	volk_64f_convert_32f_u.h \
-	volk_64f_x2_max_64f_a16.h \
-	volk_64f_x2_min_64f_a16.h \
-	volk_64u_byteswap_a16.h \
-	volk_64u_popcnt_a16.h \
-	volk_8ic_deinterleave_16i_x2_a16.h \
-	volk_8ic_s32f_deinterleave_32f_x2_a16.h \
-	volk_8ic_deinterleave_real_16i_a16.h \
-	volk_8ic_s32f_deinterleave_real_32f_a16.h \
-	volk_8ic_deinterleave_real_8i_a16.h \
-	volk_8ic_x2_multiply_conjugate_16ic_a16.h \
-	volk_8ic_x2_s32f_multiply_conjugate_32fc_a16.h \
-	volk_8i_convert_16i_a16.h \
+	volk_64f_x2_max_64f_a.h \
+	volk_64f_x2_min_64f_a.h \
+	volk_64u_byteswap_a.h \
+	volk_64u_popcnt_a.h \
+	volk_8ic_deinterleave_16i_x2_a.h \
+	volk_8ic_s32f_deinterleave_32f_x2_a.h \
+	volk_8ic_deinterleave_real_16i_a.h \
+	volk_8ic_s32f_deinterleave_real_32f_a.h \
+	volk_8ic_deinterleave_real_8i_a.h \
+	volk_8ic_x2_multiply_conjugate_16ic_a.h \
+	volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h \
+	volk_8i_convert_16i_a.h \
 	volk_8i_convert_16i_u.h \
-	volk_8i_s32f_convert_32f_a16.h \
+	volk_8i_s32f_convert_32f_a.h \
 	volk_8i_s32f_convert_32f_u.h 
-
-VOLK_MKTABLES_SOURCES = \
-	$(platform_CODE) \
-	$(top_srcdir)/lib/volk_rank_archs.c \
-	$(top_srcdir)/lib/volk_mktables.c
-
-
-volk_mktables$(EXEEXT): $(VOLK_MKTABLES_SOURCES)
-	$(CC) -o $@ $^ $(AM_CPPFLAGS) -I$(top_builddir)/include
-
-volk_tables.h: volk_mktables$(EXEEXT)
-	./volk_mktables$(EXEEXT)
-
-volk_config.h: $(top_builddir)/volk_config.h 
-	cp $^ $(top_builddir)/include/volk/$@
-
-distclean-local: 
-	rm -f volk_config_fixed.h 
-	rm -f volk_config.h
-	rm -f volk_cpu.h
-	rm -f volk.h
-	rm -f volk_registry.h
-	rm -f volk_runtime.h
-	rm -f volk_typedefs.h
-	rm -f volk_tables.h
-	rm -f *.pyc
-	rm -f Makefile.in
-	rm -f volk_environment_init.h
-	rm -f volk_mktables
-	rm -f $(BUILT_SOURCES)
diff --git a/volk/include/volk/emit_omnilog.py b/volk/include/volk/emit_omnilog.py
deleted file mode 100644
index 309d7e578..000000000
--- a/volk/include/volk/emit_omnilog.py
+++ /dev/null
@@ -1,13 +0,0 @@
-def emit_prolog():
-    tempstring = "";
-    tempstring = tempstring + '#ifdef __cplusplus\n';
-    tempstring = tempstring + 'extern "C" {\n';
-    tempstring = tempstring + '#endif\n';
-    return tempstring;
-def emit_epilog():
-    tempstring = "";
-    tempstring = tempstring + '#ifdef __cplusplus\n';
-    tempstring = tempstring + '}\n';
-    tempstring = tempstring + '#endif\n';
-    return tempstring;
-
diff --git a/volk/include/volk/make_c.py b/volk/include/volk/make_c.py
deleted file mode 100644
index 6e75067d0..000000000
--- a/volk/include/volk/make_c.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from xml.dom import minidom
-import string
-from volk_regexp import *
-
-
-def make_c(funclist, taglist, arched_arglist, retlist, my_arglist, fcountlist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/';
-    tempstring = tempstring + '\n\n#include<volk/volk.h>\n';
-    tempstring = tempstring + '#include<volk/volk_tables.h>\n';
-    tempstring = tempstring + '#include<volk/volk_typedefs.h>\n';
-    tempstring = tempstring + '#include<volk/volk_registry.h>\n';
-    tempstring = tempstring + '#include<string.h>\n';
-    for func in funclist:
-        tempstring = tempstring + "#include<volk/" + func + ".h>\n" ;
-    tempstring = tempstring + '\n';
-
-    tempstring = tempstring + "static inline unsigned int volk_get_index(const char** indices, const char* arch, const int* arch_defs) {\n";
-    tempstring = tempstring + "    int i = 1;\n"
-    tempstring = tempstring + "    for(;i<arch_defs[0];++i){\n"
-    tempstring = tempstring + "        if (strcmp(arch, indices[i]) == 0) {\n"
-    tempstring = tempstring + "            return i;\n"
-    tempstring = tempstring + "        }\n"
-    tempstring = tempstring + "    }\n"
-    tempstring = tempstring + "    return 0;\n"
-    tempstring = tempstring + "}\n"
-
-    for i in range(len(funclist)): 
-        tempstring = tempstring + "static const " + replace_volk.sub("p", funclist[i]) + " " + funclist[i] + "_archs[] = {\n";
-        
-        tags_counter = 0;    
-        for arch_list in fcountlist[i]:
-            tempstring = tempstring + "#if LV_HAVE_"
-            for ind in range(len(arch_list)):
-                
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && LV_HAVE_";
-                
-            tempstring = tempstring + "\n " + funclist[i] + "_" + str(taglist[i][tags_counter]) + ",\n#endif\n";
-            tags_counter = tags_counter + 1;
-                
-        lindex = tempstring.rfind(",");
-        tempstring = tempstring[0:lindex] + string.replace(tempstring[lindex:len(tempstring)], ",", "");
-        tempstring = tempstring + "};\n\n";
-
-        tempstring = tempstring + "static const char* " + funclist[i] + "_indices[] = {\n";
-        
-        tags_counter = 0;    
-        for arch_list in fcountlist[i]:
-            tempstring = tempstring + "#if LV_HAVE_"
-            for ind in range(len(arch_list)):
-                
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && LV_HAVE_";
-                
-            tempstring = tempstring + "\n \"" + str(taglist[i][tags_counter]) + "\",\n#endif\n";
-            tags_counter = tags_counter + 1;
-                
-        lindex = tempstring.rfind(",");
-        tempstring = tempstring[0:lindex] + string.replace(tempstring[lindex:len(tempstring)], ",", "");
-        tempstring = tempstring + "};\n\n";
-                                                                          
-        tempstring = tempstring + retlist[i] + "inline " + funclist[i] + "_manual" + arched_arglist[i] + '\n';
-        tempstring = tempstring + "return " + funclist[i] + "_archs[volk_get_index(" + funclist[i] + "_indices, arch, " + funclist[i] + "_arch_defs)](" + my_arglist[i] + ");" + "\n}\n";
-    
-        tempstring = tempstring + retlist[i] + "inline " + funclist[i] + replace_arch.sub("", arched_arglist[i]) + '\n';
-    
-        tempstring = tempstring + funclist[i] + "_archs[" + funclist[i] + "_func_table](" + my_arglist[i] + ");" + '\n';
-        tempstring = tempstring + "}\n\n";                                       
-    
-    return tempstring;
diff --git a/volk/include/volk/make_cpuid_generic_c.py b/volk/include/volk/make_cpuid_generic_c.py
deleted file mode 100644
index c682d4138..000000000
--- a/volk/include/volk/make_cpuid_generic_c.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-from xml.dom import minidom
-
-def make_cpuid_generic_c(dom) :
-    tempstring = "";
-    tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
-    tempstring = tempstring + "#include <volk/volk_cpu.h>\n"
-    tempstring = tempstring + "#include <volk/volk_config_fixed.h>\n\n"
-    tempstring = tempstring + "struct VOLK_CPU volk_cpu;\n\n"
-    
-    for domarch in dom:
-        if str(domarch.attributes["type"].value) == "all":
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 1;\n"
-            tempstring = tempstring + "}\n\n"
-    
-        else:
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "  return 0;\n"
-            tempstring = tempstring + "}\n\n"
-
-    tempstring = tempstring + "void volk_cpu_init() {\n";
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    volk_cpu.has_" + arch + " = &i_can_has_" + arch + ";\n"
-    tempstring = tempstring + "}\n\n"
-
-    tempstring = tempstring + "unsigned int volk_get_lvarch() {\n";
-    tempstring = tempstring + "    unsigned int retval = 0;\n"
-    tempstring = tempstring + "    volk_cpu_init();\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    retval += volk_cpu.has_" + arch + "() << LV_" + arch.swapcase() + ";\n"
-    tempstring = tempstring + "    return retval;\n"
-    tempstring = tempstring + "}\n\n"
-
-    return tempstring;
diff --git a/volk/include/volk/make_cpuid_powerpc_c.py b/volk/include/volk/make_cpuid_powerpc_c.py
deleted file mode 100644
index 0b0ea84e7..000000000
--- a/volk/include/volk/make_cpuid_powerpc_c.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-from xml.dom import minidom
-
-def make_cpuid_powerpc_c(dom) :
-    tempstring = "";
-    tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
-    tempstring = tempstring + "#include <volk/volk_cpu.h>\n"
-    tempstring = tempstring + "#include <volk/volk_config_fixed.h>\n\n"
-    tempstring = tempstring + "struct VOLK_CPU volk_cpu;\n\n"
-
-    #just assume it has them for powerpc
-    for domarch in dom:
-        if str(domarch.attributes["type"].value) == "powerpc":
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 1;\n"
-            tempstring = tempstring + "}\n\n"
-        elif str(domarch.attributes["type"].value) == "all":
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 1;\n"
-            tempstring = tempstring + "}\n\n"
-        else:
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 0;\n"
-            tempstring = tempstring + "}\n\n"
-
-
-    tempstring = tempstring + "void volk_cpu_init() {\n";
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    volk_cpu.has_" + arch + " = &i_can_has_" + arch + ";\n"
-
-    tempstring = tempstring + "}\n\n"
-    tempstring = tempstring + "unsigned int volk_get_lvarch() {\n";
-    tempstring = tempstring + "    unsigned int retval = 0;\n"
-    tempstring = tempstring + "    volk_cpu_init();\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    retval += volk_cpu.has_" + arch + "() << LV_" + arch.swapcase() + ";\n"
-    tempstring = tempstring + "    return retval;\n"
-    tempstring = tempstring + "}\n\n"
-
-    return tempstring;
-            
diff --git a/volk/include/volk/make_cpuid_x86_c.py b/volk/include/volk/make_cpuid_x86_c.py
deleted file mode 100644
index 2b2bd7c91..000000000
--- a/volk/include/volk/make_cpuid_x86_c.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-from xml.dom import minidom
-
-def make_cpuid_x86_c(dom) :
-    tempstring = "";
-    tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
-    tempstring = tempstring + "#include <volk/volk_cpu.h>\n"
-    tempstring = tempstring + "#include <volk/volk_config_fixed.h>\n\n"
-    tempstring = tempstring + "#include <gcc_x86_cpuid.h>\n\n"
-    tempstring = tempstring + "struct VOLK_CPU volk_cpu;\n\n"
-
-    tempstring = tempstring + "#define cpuid_x86(op, r) __get_cpuid(op, r+0, r+1, r+2, r+3)\n\n"
-    tempstring = tempstring + "static inline unsigned int cpuid_eax(unsigned int op) {\n";
-    tempstring = tempstring + "    unsigned int regs[4];\n"
-    tempstring = tempstring + "    cpuid_x86 (op, regs);\n"
-    tempstring = tempstring + "    return regs[0];\n"
-    tempstring = tempstring + "}\n\n";
-
-    tempstring = tempstring + "static inline unsigned int cpuid_ebx(unsigned int op) {\n";
-    tempstring = tempstring + "    unsigned int regs[4];\n"
-    tempstring = tempstring + "    cpuid_x86 (op, regs);\n"
-    tempstring = tempstring + "    return regs[1];\n"
-    tempstring = tempstring + "}\n\n";
-
-    tempstring = tempstring + "static inline unsigned int cpuid_ecx(unsigned int op) {\n";
-    tempstring = tempstring + "    unsigned int regs[4];\n"
-    tempstring = tempstring + "    cpuid_x86 (op, regs);\n"
-    tempstring = tempstring + "    return regs[2];\n"
-    tempstring = tempstring + "}\n\n";
-    
-    tempstring = tempstring + "static inline unsigned int cpuid_edx(unsigned int op) {\n";
-    tempstring = tempstring + "    unsigned int regs[4];\n"
-    tempstring = tempstring + "    cpuid_x86 (op, regs);\n"
-    tempstring = tempstring + "    return regs[3];\n"
-    tempstring = tempstring + "}\n\n";
-    
-    for domarch in dom:
-        if str(domarch.attributes["type"].value) == "x86":
-            if "no_test" in domarch.attributes.keys():
-                no_test = str(domarch.attributes["no_test"].value);
-                if no_test == "true":
-                    no_test = True;
-                else:
-                    no_test = False;
-            else:
-                no_test = False;
-            arch = str(domarch.attributes["name"].value);
-            op = domarch.getElementsByTagName("op");
-            if op:
-                op = str(op[0].firstChild.data);
-            reg = domarch.getElementsByTagName("reg");
-            if reg:
-                reg = str(reg[0].firstChild.data);
-            shift = domarch.getElementsByTagName("shift");
-            if shift:
-                shift = str(shift[0].firstChild.data);
-            val = domarch.getElementsByTagName("val");
-            if val:
-                val = str(val[0].firstChild.data);
-            
-            if no_test:
-                tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-                tempstring = tempstring + "    return 1;\n"
-                tempstring = tempstring + "}\n\n"
-            elif op == "1":
-                tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-                tempstring = tempstring + "    unsigned int e" + reg + "x = cpuid_e" + reg + "x (" + op + ");\n"
-                tempstring = tempstring + "    return ((e" + reg + "x >> " + shift + ") & 1) == " + val + ";\n"
-                tempstring = tempstring + "}\n\n";
-
-            elif op == "0x80000001":
-                tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-                tempstring = tempstring + "    unsigned int extended_fct_count = cpuid_eax(0x80000000);\n";
-                tempstring = tempstring + "    if (extended_fct_count < 0x80000001)\n";
-                tempstring = tempstring + "        return "+ val + "^1;\n\n"
-                tempstring = tempstring + "    unsigned int extended_features = cpuid_e" + reg + "x (" + op + ");\n";
-                tempstring = tempstring + "    return ((extended_features >> " + shift + ") & 1) == " + val + ";\n"
-                tempstring = tempstring + "}\n\n";
-        elif str(domarch.attributes["type"].value) == "all":
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 1;\n"
-            tempstring = tempstring + "}\n\n"
-        else:
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "int i_can_has_" + arch + " () {\n"
-            tempstring = tempstring + "    return 0;\n"
-            tempstring = tempstring + "}\n\n"
-    
-    tempstring = tempstring + "void volk_cpu_init() {\n";
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    volk_cpu.has_" + arch + " = &i_can_has_" + arch + ";\n"
-    tempstring = tempstring + "}\n\n"
-
-    tempstring = tempstring + "unsigned int volk_get_lvarch() {\n";
-    tempstring = tempstring + "    unsigned int retval = 0;\n"
-    tempstring = tempstring + "    volk_cpu_init();\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + "    retval += volk_cpu.has_" + arch + "() << LV_" + arch.swapcase() + ";\n"
-    tempstring = tempstring + "    return retval;\n"
-    tempstring = tempstring + "}\n\n"
-
-    return tempstring;
-
-    
-            
-        
-
-                
-                
diff --git a/volk/include/volk/make_h.py b/volk/include/volk/make_h.py
deleted file mode 100644
index 81d9ad401..000000000
--- a/volk/include/volk/make_h.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from xml.dom import minidom
-from emit_omnilog import *
-from volk_regexp import *
-
-
-
-def make_h(funclist, arched_arglist, retlist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/';
-    tempstring = tempstring + '\n#ifndef INCLUDED_VOLK_H';
-    tempstring = tempstring + '\n#define INCLUDED_VOLK_H';
-    tempstring = tempstring + '\n\n#include<inttypes.h>\n';
-    tempstring = tempstring + '#include<volk/volk_complex.h>\n';
-    tempstring = tempstring + '#include<volk/volk_config.h>\n';
-    tempstring = tempstring + '#include<volk/volk_config_fixed.h>\n';
-    tempstring = tempstring + '#include<volk/volk_environment_init.h>\n'
-    tempstring = tempstring + emit_prolog()
-    tempstring = tempstring + '\n';               
-
-    for i in range(len(retlist)):
-        tempstring = tempstring + retlist[i] + funclist[i] + replace_bracket.sub(";", replace_arch.sub("", arched_arglist[i])) + '\n';
-        tempstring = tempstring + retlist[i] + funclist[i] + "_manual" + replace_bracket.sub(";", arched_arglist[i]) + '\n';
-
-    tempstring = tempstring + emit_epilog();
-
-    tempstring = tempstring + "#endif /*INCLUDED_VOLK_H*/\n";
-    
-    return tempstring;
diff --git a/volk/include/volk/make_init_c.py b/volk/include/volk/make_init_c.py
deleted file mode 100644
index 330e19592..000000000
--- a/volk/include/volk/make_init_c.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from xml.dom import minidom
-
-def make_init_c(funclist, dom) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/';
-
-    tempstring = tempstring + '\n\n#include<volk/volk_runtime.h>\n';
-    tempstring = tempstring + '#include<volk/volk_cpu.h>\n';
-    tempstring = tempstring + '#include<volk_init.h>\n';
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        incs = domarch.getElementsByTagName("include");
-        for inc in incs:
-            my_inc = str(inc.firstChild.data);
-            tempstring = tempstring + "#if LV_HAVE_" + arch.swapcase() + "\n";
-            tempstring = tempstring + "#include<" + my_inc + ">\n";
-            tempstring = tempstring + "#endif\n"
-    tempstring = tempstring + '\n\n';
-
-    tempstring = tempstring + "extern struct VOLK_RUNTIME volk_runtime;\n\n";
-    tempstring = tempstring + "struct VOLK_RUNTIME* get_volk_runtime(){\n";
-    tempstring = tempstring + "    return &volk_runtime;\n";
-    tempstring = tempstring + "}\n\n"
-    tempstring = tempstring + "    void volk_runtime_init() {\nvolk_cpu_init();\n";
-
-    for func in funclist:
-        tempstring = tempstring + "    volk_runtime." + func + " = default_acquire_" + func + ";\n";
-
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        envs = domarch.getElementsByTagName("environment");
-        for env in envs:
-            cmd = str(env.firstChild.data);
-            tempstring = tempstring + "    if(volk_cpu.has_" + arch + "()){\n";
-            tempstring = tempstring + "#if LV_HAVE_" + arch.swapcase() + "\n";
-            tempstring = tempstring + "        " + cmd + "\n";
-            tempstring = tempstring + "#endif\n"     
-            tempstring = tempstring + "    }\n";
-            
-    tempstring = tempstring + "}\n";
-
-    return tempstring
diff --git a/volk/include/volk/make_init_h.py b/volk/include/volk/make_init_h.py
deleted file mode 100644
index 6dbe1c585..000000000
--- a/volk/include/volk/make_init_h.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from xml.dom import minidom
-from emit_omnilog import *
-from volk_regexp import *
-
-
-
-def make_init_h(funclist, arched_arglist, retlist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/';
-
-    tempstring = tempstring + '\n#ifndef INCLUDED_VOLK_INIT_H';
-    tempstring = tempstring + '\n#define INCLUDED_VOLK_INIT_H';
-    tempstring = tempstring + '\n\n#include<inttypes.h>\n';
-    tempstring = tempstring + '#include<volk/volk_complex.h>\n';
-
-    tempstring = tempstring + '\n';
-
-    tempstring = tempstring + emit_prolog();
-    
-    for i in range(len(retlist)):
-        tempstring = tempstring + retlist[i] + " default_acquire_" + funclist[i] +  replace_bracket.sub(";", replace_arch.sub("", arched_arglist[i])) + '\n';
-
-    tempstring= tempstring + emit_epilog();
-    tempstring = tempstring + "#endif /*INCLUDED_VOLK_INIT_H*/\n";
-    
-    return tempstring;
diff --git a/volk/include/volk/make_mktables.py b/volk/include/volk/make_mktables.py
deleted file mode 100644
index 051ac268d..000000000
--- a/volk/include/volk/make_mktables.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-def make_mktables(funclist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/\n';
-
-    tempstring = tempstring + '#include<stdio.h>\n';
-    tempstring = tempstring + '#include<volk/volk_registry.h>\n';
-    tempstring = tempstring + '#include<volk_rank_archs.h>\n';
-    tempstrgin = tempstring + '#include<volk/volk_cpu.h>\n';
-    tempstring = tempstring + "\n\n";
-
-    tempstring = tempstring + 'int main() {\n';
-    tempstring = tempstring + '  int i = 0;\n';
-    tempstring = tempstring + '  FILE* output;\n';
-    tempstring = tempstring + '  output = fopen("volk_tables.h", "w");\n';
-    tempstring = tempstring + '  fprintf(output, "#ifndef INCLUDED_VOLK_TABLES_H\\n");\n';
-    tempstring = tempstring + '  fprintf(output, "#define INCLUDED_VOLK_TABLES_H\\n\\n");\n';
-    
-    for func in funclist:
-        tempstring = tempstring + '  fprintf(output, "static const ' + func + '_func_table = %u;\\n", volk_rank_archs(' + func + '_arch_defs, volk_get_lvarch()));\n';
-    tempstring = tempstring + '  fprintf(output, "#endif /*INCLUDED_VOLK_TABLES_H*/\\n");\n';
-    tempstring = tempstring + '  fclose(output);\n'
-    tempstring = tempstring + '}\n';
-    return tempstring;
-        
-
-    
-
-    
-
-
-
diff --git a/volk/include/volk/make_registry.py b/volk/include/volk/make_registry.py
deleted file mode 100644
index 8457d61f3..000000000
--- a/volk/include/volk/make_registry.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from xml.dom import minidom
-from emit_omnilog import *
-import string
-
-def make_registry(dom, funclist, fcountlist) :
-    tempstring = "";
-    tempstring = tempstring + "/*this file is auto_generated by volk_register.py*/\n\n";
-    tempstring = tempstring +'\n#ifndef INCLUDED_VOLK_REGISTRY_H';
-    tempstring = tempstring +'\n#define INCLUDED_VOLK_REGISTRY_H\n\n';
-    tempstring = tempstring +'#include<volk/volk_config.h>\n';
-    tempstring = tempstring +'#include<volk/volk_config_fixed.h>\n';
-    tempstring = tempstring + emit_prolog();
-    tempstring = tempstring + '\n'
-
-    
-
-    
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring +"#if LV_HAVE_" + arch.swapcase() + "\n";
-        tempstring = tempstring +"#define LV_" + arch.swapcase() + "_CNT 1\n";
-        tempstring = tempstring +"#else\n";
-        tempstring = tempstring +"#define LV_" + arch.swapcase() + "_CNT 0\n";
-        tempstring = tempstring +"#endif /*LV_HAVE_" + arch.swapcase() + "*/\n\n";
-
-    counter = 0;
-    for fcount in fcountlist:
-        tempstring = tempstring + "static const int " + funclist[counter] + "_arch_defs[] = {\n";
-        counter = counter + 1;
-        for arch_list in fcount:
-            tempstring = tempstring + " (LV_"
-            for ind in range(len(arch_list)): 
-                tempstring = tempstring + arch_list[ind] + "_CNT";
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " * LV_";
-            tempstring = tempstring + ") + ";
-        lindex = tempstring.rfind(" + ");
-        tempstring = tempstring[0:lindex] + string.replace(tempstring[lindex:len(tempstring)], " + ", "");
-        tempstring = tempstring + ",\n"
-        for arch_list in fcount:
-            tempstring = tempstring + "#if LV_HAVE_"
-            for ind in range(len(arch_list)): 
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && LV_HAVE_";
-            tempstring = tempstring + "\n"
-            tempstring = tempstring + " (1 << LV_"
-            for ind in range(len(arch_list)):
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + ") + (1 << LV_"
-            tempstring = tempstring + "),\n#endif\n"
-        lindex = tempstring.rfind(",");
-        tempstring = tempstring[0:lindex] + string.replace(tempstring[lindex:len(tempstring)], ",", "");
-        tempstring = tempstring + "};\n\n"
-
-    
-    tempstring = tempstring + emit_epilog();
-    tempstring = tempstring +"#endif /*INCLUDED_VOLK_REGISTRY_H*/\n";
-
-    return tempstring;
-    
diff --git a/volk/include/volk/make_runtime.py b/volk/include/volk/make_runtime.py
deleted file mode 100644
index 645b3aaee..000000000
--- a/volk/include/volk/make_runtime.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from xml.dom import minidom
-from emit_omnilog import *
-from volk_regexp import *
-
-
-
-def make_runtime(funclist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/\n';
-
-    tempstring = tempstring + '\n#ifndef INCLUDED_VOLK_RUNTIME';
-    tempstring = tempstring + '\n#define INCLUDED_VOLK_RUNTIME';
-    tempstring = tempstring + '\n\n#include<volk/volk_typedefs.h>\n';
-    tempstring = tempstring + '#include<volk/volk_config.h>\n';
-    tempstring = tempstring + '#include<volk/volk_config_fixed.h>\n';
-    tempstring = tempstring + '#include<volk/volk_complex.h>\n';
-    tempstring = tempstring + emit_prolog();
-
-    tempstring = tempstring + '\n';
-
-    tempstring = tempstring + "struct VOLK_RUNTIME {\n";
-
-    for i in range(len(funclist)):
-        tempstring = tempstring + replace_volk.sub("p", funclist[i]) + " " + funclist[i] + ";\n";
-    tempstring = tempstring + "};\n\n";
-
-    tempstring = tempstring + "struct VOLK_RUNTIME* get_volk_runtime();\n\n"
-    tempstring = tempstring + "\nvoid volk_runtime_init();\n";
-
-    tempstring = tempstring + emit_epilog();
-    tempstring = tempstring + "#endif /*INCLUDED_VOLK_RUNTIME*/\n";
-
-    return tempstring;
-    
diff --git a/volk/include/volk/make_runtime_c.py b/volk/include/volk/make_runtime_c.py
deleted file mode 100644
index 070df9ba7..000000000
--- a/volk/include/volk/make_runtime_c.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from xml.dom import minidom
-import string
-from volk_regexp import *
-
-
-def make_runtime_c(funclist, taglist, arched_arglist, retlist, my_arglist, fcountlist) :
-    tempstring = "";
-    tempstring = tempstring + '/*this file is auto generated by volk_register.py*/';
-
-    
-    tempstring = tempstring + '\n\n#include<volk/volk_runtime.h>\n';
-    tempstring = tempstring + '#include<volk/volk_config.h>\n';
-    tempstring = tempstring + "#include<volk/volk_config_fixed.h>\n";
-    tempstring = tempstring + '#include<volk/volk_cpu.h>\n';
-    tempstring = tempstring + '#include<volk_init.h>\n';
-    tempstring = tempstring + '#include<volk/volk_registry.h>\n';
-
-    for func in funclist:
-        tempstring = tempstring + "#include<volk/" + func + ".h>\n" ;
-    tempstring = tempstring + '\n';
-
-    tempstring = tempstring + "struct VOLK_RUNTIME volk_runtime;\n";
-    
-    for i in range(len(funclist)): 
-        tempstring = tempstring + "static const " + replace_volk.sub("p", funclist[i]) + " " + funclist[i] + "_archs[] = {\n";
-        
-        tags_counter = 0;    
-        for arch_list in fcountlist[i]:
-            tempstring = tempstring + "#if LV_HAVE_"
-            for ind in range(len(arch_list)):
-                
-                tempstring = tempstring + arch_list[ind];
-                if ind < len(arch_list) - 1:
-                    tempstring = tempstring + " && LV_HAVE_";
-                
-            tempstring = tempstring + "\n " + funclist[i] + "_" + str(taglist[i][tags_counter]) + ",\n#endif\n";
-            tags_counter = tags_counter + 1;
-                
-        lindex = tempstring.rfind(",");
-        tempstring = tempstring[0:lindex] + string.replace(tempstring[lindex:len(tempstring)], ",", "");
-        tempstring = tempstring + "};\n\n";
-
-
-        tempstring = tempstring + retlist[i] + "default_acquire_" + funclist[i] + replace_arch.sub("", arched_arglist[i]) + '\n';
-        tempstring = tempstring + "volk_runtime." + funclist[i] + " = " + funclist[i] + "_archs[volk_rank_archs(" + funclist[i] + "_arch_defs, volk_get_lvarch())];\n" + "return " + funclist[i] + "_archs[volk_rank_archs(" + funclist[i] + "_arch_defs, volk_get_lvarch())](" + my_arglist[i] + ");" + '\n}\n';
-    
-    return tempstring;
diff --git a/volk/include/volk/make_set_simd.py b/volk/include/volk/make_set_simd.py
deleted file mode 100644
index c74b0464d..000000000
--- a/volk/include/volk/make_set_simd.py
+++ /dev/null
@@ -1,272 +0,0 @@
-#
-# Copyright 2010 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from xml.dom import minidom
-
-def make_set_simd(dom) :
-    tempstring = "";
-    tempstring = tempstring +'dnl this file is auto generated by volk_register.py\n\n';
-
-    tempstring = tempstring + "AC_DEFUN([_MAKE_FAKE_PROCCPU],\n";
-    tempstring = tempstring + "[\n";
-    tempstring = tempstring + "  AC_REQUIRE([GR_SET_MD_CPU])\n";
-    tempstring = tempstring + "  AC_MSG_CHECKING([proccpu])\n";
-    tempstring = tempstring + "  case \"$MD_CPU\" in\n";
-    tempstring = tempstring + "  (x86)\n";
-    tempstring = tempstring + "    if test -z \"`${CC} -o proccpu -I$srcdir/include/ -I$srcdir/lib $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_x86.c 2>&1`\"\n";
-    tempstring = tempstring + "      then\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(yes)\n";
-    tempstring = tempstring + "        lv_PROCCPU=\"`./proccpu`\"\n";
-    tempstring = tempstring + "        rm -f proccpu\n";
-    tempstring = tempstring + "      else\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(no)\n";
-    tempstring = tempstring + "        lv_PROCCPU=no\n";
-    tempstring = tempstring + "    fi\n"
-    tempstring = tempstring + "  ;;\n";
-    tempstring = tempstring + "  (powerpc)\n";
-    tempstring = tempstring + "    if test -z \"`${CC} -o proccpu -I$srcdir/include/ $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_powerpc.c 2>&1`\"\n";
-    tempstring = tempstring + "      then\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(yes)\n";
-    tempstring = tempstring + "        lv_PROCCPU=\"`./proccpu`\"\n";
-    tempstring = tempstring + "        rm -f proccpu\n";
-    tempstring = tempstring + "      else\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(no)\n";
-    tempstring = tempstring + "        lv_PROCCPU=no\n";
-    tempstring = tempstring + "    fi\n"
-    tempstring = tempstring + "  ;;\n";
-    tempstring = tempstring + "  (*)\n";
-    tempstring = tempstring + "    if test -z \"`${CC} -o proccpu -I$srcdir/include/ $srcdir/lib/volk_proccpu_sim.c $srcdir/lib/volk_cpu_generic.c 2>&1`\"\n";
-    tempstring = tempstring + "      then\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(yes)\n";
-    tempstring = tempstring + "        lv_PROCCPU=\"`./proccpu`\"\n";
-    tempstring = tempstring + "        rm -f proccpu\n";
-    tempstring = tempstring + "      else\n";
-    tempstring = tempstring + "        AC_MSG_RESULT(no)\n";
-    tempstring = tempstring + "        lv_PROCCPU=no\n";
-    tempstring = tempstring + "    fi\n"
-    tempstring = tempstring + "  ;;\n";
-    tempstring = tempstring + "  esac\n";
-    tempstring = tempstring + "])\n"
-
-    for domarch in dom:
-        if str(domarch.attributes["type"].value) != "all":
-            arch = str(domarch.attributes["name"].value);
-            flag = domarch.getElementsByTagName("flag");
-            flag = str(flag[0].firstChild.data);
-            tempstring = tempstring + "AC_DEFUN([_TRY_ADD_" + arch.swapcase() + "],\n";
-            tempstring = tempstring + "[\n";
-            tempstring = tempstring + "  LF_CHECK_CC_FLAG([-" + flag + "])\n";
-            tempstring = tempstring + "  LF_CHECK_CXX_FLAG([-" + flag + "])\n";
-            tempstring = tempstring + "])\n";
-
-    tempstring = tempstring + "AC_DEFUN([LV_SET_SIMD_FLAGS],\n";
-    tempstring = tempstring + "[\n";
-    tempstring = tempstring + "  AC_REQUIRE([GR_SET_MD_CPU])\n";
-    tempstring = tempstring + "  AC_SUBST(LV_CXXFLAGS)\n";
-    tempstring = tempstring + "  indCC=no\n";
-    tempstring = tempstring + "  indCXX=no\n";
-    tempstring = tempstring + "  indLV_ARCH=no\n";
-    tempstring = tempstring + "  AC_ARG_WITH(lv_arch,\n";
-    tempstring = tempstring + "    AC_HELP_STRING([--with-lv_arch=ARCH],[set volk hardware speedups as space separated string with elements from the following list(";
-    
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        tempstring = tempstring + arch + ", "
-    tempstring = tempstring[0:len(tempstring) - 2];
-        
-    tempstring = tempstring + ")]),\n";
-    tempstring = tempstring + "      [cf_with_lv_arch=\"$withval\"],\n";
-    tempstring = tempstring + "      [cf_with_lv_arch=\"\"])\n";
-    if str(domarch.attributes["type"].value) == "all":
-        arch = str(domarch.attributes["name"].value);    
-        tempstring = tempstring + "  AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [always set "+ arch + "!])\n";
-    tempstring = tempstring + "  ADDONS=\"\"\n";
-    tempstring = tempstring + "  BUILT_ARCHS=\"\"\n";
-    tempstring = tempstring + "  _MAKE_FAKE_PROCCPU\n";
-    tempstring = tempstring + "  OVERRULE_FLAG=\"no\"\n";
-    tempstring = tempstring + "  if test -z \"$cf_with_lv_arch\"; then\n";
-    tempstring = tempstring + "    cf_with_lv_arch=$lv_PROCCPU\n";
-    tempstring = tempstring + "    OVERRULE_FLAG=\"yes\"\n";
-
-    tempstring = tempstring + "  fi\n";
-    for domarch in dom:
-        if str(domarch.attributes["type"].value) != "all":
-            arch = str(domarch.attributes["name"].value);
-            tempstring = tempstring + "  LV_HAVE_" + arch.swapcase() + "=no\n";
-
-    tempstring = tempstring + "  case \"$MD_CPU\" in\n";
-    tempstring = tempstring + "  (x86)\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        atype = str(domarch.attributes["type"].value);
-        if atype == "x86":
-            tempstring = tempstring + "    _TRY_ADD_" + arch.swapcase() + "\n";
-
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        atype = str(domarch.attributes["type"].value);
-        overrule = domarch.getElementsByTagName("overrule");
-        if overrule:
-            overrule = str(overrule[0].firstChild.data);
-        else:
-            overrule = "";
-        overrule_val = domarch.getElementsByTagName("overrule_val");
-        if overrule_val:
-            overrule_val = str(overrule_val[0].firstChild.data);
-        else:
-            overrule_val = "";
-        flag = domarch.getElementsByTagName("flag");
-        flag = str(flag[0].firstChild.data);
-        if atype == "x86":
-            tempstring = tempstring + "    for i in $lf_CXXFLAGS\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X-" + flag +"; then\n";
-            tempstring = tempstring + "        indCXX=yes\n";
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    for i in $lf_CFLAGS\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X-" + flag +"; then\n";
-            tempstring = tempstring + "        indCC=yes\n";
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    for i in $cf_with_lv_arch\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X" + arch + "; then\n";
-            tempstring = tempstring + "        indLV_ARCH=yes\n"
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
-            tempstring = tempstring + "      indLV_ARCH=no\n"
-            tempstring = tempstring + "    fi\n"
-            
-            tempstring = tempstring + "    if test \"$indCC\" == \"yes\" && test \"$indCXX\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"        
-            
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      ADDONS=\"${ADDONS} -" + flag + "\"\n";
-            tempstring = tempstring + "      BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    indCC=no\n"
-            tempstring = tempstring + "    indCXX=no\n"
-            tempstring = tempstring + "    indLV_ARCH=no\n"
-        elif atype == "all":
-            tempstring = tempstring + "    for i in $cf_with_lv_arch\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X" + arch + "; then\n";
-            tempstring = tempstring + "        indLV_ARCH=yes\n"
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
-            tempstring = tempstring + "      indLV_ARCH=no\n"
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    if test \"$indLV_ARCH\" == \"yes\"; then\n"        
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
-            tempstring = tempstring + "      BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    indLV_ARCH=no\n"
-            
-    tempstring = tempstring + "  ;;\n"
-        
-    tempstring = tempstring + "  (powerpc)\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        atype = str(domarch.attributes["type"].value);
-        if atype == "powerpc":
-            tempstring = tempstring + "    _TRY_ADD_" + arch.swapcase() + "\n";
-
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        atype = str(domarch.attributes["type"].value);
-        flag = domarch.getElementsByTagName("flag");
-        flag = str(flag[0].firstChild.data);
-        if atype == "powerpc":
-            tempstring = tempstring + "    for i in $lf_CXXFLAGS\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X-" + flag +"; then\n";
-            tempstring = tempstring + "        indCXX=yes\n";
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    for i in $lf_CFLAGS\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X-" + flag +"; then\n";
-            tempstring = tempstring + "        indCC=yes\n";
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    for i in $cf_with_lv_arch\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X" + arch + "; then\n";
-            tempstring = tempstring + "        indLV_ARCH=yes\n"
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    if test \"$indCC\" = yes && test \"indCXX\" = yes && \"indLV_ARCH\" = yes; then\n"
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      ADDONS=\"${ADDONS} -" + flag + "\"\n";
-            tempstring = tempstring + "      BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    indCC=no\n"
-            tempstring = tempstring + "    indCXX=no\n"
-            tempstring = tempstring + "    indLV_ARCH=no\n"
-        elif atype == "all":
-            tempstring = tempstring + "    for i in $cf_with_lv_arch\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X" + arch + "; then\n";
-            tempstring = tempstring + "        indLV_ARCH=yes\n"
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
-            tempstring = tempstring + "      indLV_ARCH=no\n"
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    if test \"$indLV_ARCH\" == \"yes\"; then\n"
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
-            tempstring = tempstring + "      BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    indLV_ARCH=no\n"
-    tempstring = tempstring + "  ;;\n"
-    tempstring = tempstring + "  (*)\n"
-    for domarch in dom:
-        arch = str(domarch.attributes["name"].value);
-        atype = str(domarch.attributes["type"].value);
-        flag = domarch.getElementsByTagName("flag");
-        flag = str(flag[0].firstChild.data);
-        if atype == "all":
-            tempstring = tempstring + "    for i in $cf_with_lv_arch\n"
-            tempstring = tempstring + "    do\n"
-            tempstring = tempstring + "      if test \"X$i\" = X" + arch + "; then\n";
-            tempstring = tempstring + "        indLV_ARCH=yes\n"
-            tempstring = tempstring + "      fi\n"
-            tempstring = tempstring + "    done\n"
-            tempstring = tempstring + "    if  test -n \"" + overrule + "\" && test \"$" + overrule + "\" == \"" + overrule_val + "\" && test \"$OVERRULE_FLAG\" == \"yes\" && test \"$indLV_ARCH\" == \"yes\"; then\n"
-            tempstring = tempstring + "      indLV_ARCH=no\n"
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    if test \"$indLV_ARCH\" == \"yes\"; then\n"        
-            tempstring = tempstring + "      AC_DEFINE(LV_HAVE_" + arch.swapcase() + ", 1, [" + arch + " flag set])\n";
-            tempstring = tempstring + "      LV_HAVE_" + arch.swapcase() + "=yes\n";
-            tempstring = tempstring + "      BUILT_ARCHS=\"${BUILT_ARCHS} " + arch + "\"\n";
-            tempstring = tempstring + "    fi\n"
-            tempstring = tempstring + "    indLV_ARCH=no\n"
-    tempstring = tempstring + "  ;;\n"
-    tempstring = tempstring + "  esac\n"
-    tempstring = tempstring + "  LV_CXXFLAGS=\"${LV_CXXFLAGS} ${ADDONS}\"\n"
-    tempstring = tempstring + "])\n"
-   
-    return tempstring;
-
-        
diff --git a/volk/include/volk/volk_16i_branch_4_state_8_a16.h b/volk/include/volk/volk_16i_branch_4_state_8_a.h
index 3437c1a6b..0424e66e9 100644
--- a/volk/include/volk/volk_16i_branch_4_state_8_a16.h
+++ b/volk/include/volk/volk_16i_branch_4_state_8_a.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_16i_branch_4_state_8_a16_H
-#define INCLUDED_volk_16i_branch_4_state_8_a16_H
+#ifndef INCLUDED_volk_16i_branch_4_state_8_a_H
+#define INCLUDED_volk_16i_branch_4_state_8_a_H
 
 
 #include<inttypes.h>
@@ -8,13 +8,13 @@
 
 
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 
 #include<xmmintrin.h>
 #include<emmintrin.h>
 #include<tmmintrin.h>
 
-static inline  void volk_16i_branch_4_state_8_a16_ssse3(short* target,  short* src0, char** permuters, short* cntl2, short* cntl3, short* scalars) {
+static inline  void volk_16i_branch_4_state_8_a_ssse3(short* target,  short* src0, char** permuters, short* cntl2, short* cntl3, short* scalars) {
 	
   
   __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11;
@@ -137,8 +137,8 @@ static inline  void volk_16i_branch_4_state_8_a16_ssse3(short* target,  short* s
 	
 #endif /*LV_HAVE_SSEs*/
 
-#if LV_HAVE_GENERIC
-static inline  void volk_16i_branch_4_state_8_a16_generic(short* target,  short* src0, char** permuters, short* cntl2, short* cntl3, short* scalars) {
+#ifdef LV_HAVE_GENERIC
+static inline  void volk_16i_branch_4_state_8_a_generic(short* target,  short* src0, char** permuters, short* cntl2, short* cntl3, short* scalars) {
 	int i = 0;
 	
 	int bound = 4;
@@ -191,4 +191,4 @@ static inline  void volk_16i_branch_4_state_8_a16_generic(short* target,  short*
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_16i_branch_4_state_8_a16_H*/
+#endif /*INCLUDED_volk_16i_branch_4_state_8_a_H*/
diff --git a/volk/include/volk/volk_16i_convert_8i_a16.h b/volk/include/volk/volk_16i_convert_8i_a.h
index 73e45ad63..8046035c7 100644
--- a/volk/include/volk/volk_16i_convert_8i_a16.h
+++ b/volk/include/volk/volk_16i_convert_8i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16i_convert_8i_a16_H
-#define INCLUDED_volk_16i_convert_8i_a16_H
+#ifndef INCLUDED_volk_16i_convert_8i_a_H
+#define INCLUDED_volk_16i_convert_8i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Converts the input 16 bit integer data into 8 bit integer data
@@ -12,7 +12,7 @@
   \param outputVector The 8 bit output data buffer
   \param num_points The number of data values to be converted
 */
-static inline void volk_16i_convert_8i_a16_sse2(int8_t* outputVector, const int16_t* inputVector, unsigned int num_points){
+static inline void volk_16i_convert_8i_a_sse2(int8_t* outputVector, const int16_t* inputVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int sixteenthPoints = num_points / 16;
     
@@ -52,7 +52,7 @@ static inline void volk_16i_convert_8i_a16_sse2(int8_t* outputVector, const int1
   \param outputVector The 8 bit output data buffer
   \param num_points The number of data values to be converted
 */
-static inline void volk_16i_convert_8i_a16_generic(int8_t* outputVector, const int16_t* inputVector, unsigned int num_points){
+static inline void volk_16i_convert_8i_a_generic(int8_t* outputVector, const int16_t* inputVector, unsigned int num_points){
   int8_t* outputVectorPtr = outputVector;
   const int16_t* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -66,4 +66,4 @@ static inline void volk_16i_convert_8i_a16_generic(int8_t* outputVector, const i
 
 
 
-#endif /* INCLUDED_volk_16i_convert_8i_a16_H */
+#endif /* INCLUDED_volk_16i_convert_8i_a_H */
diff --git a/volk/include/volk/volk_16i_convert_8i_u.h b/volk/include/volk/volk_16i_convert_8i_u.h
index 5fc792b56..df1084fe0 100644
--- a/volk/include/volk/volk_16i_convert_8i_u.h
+++ b/volk/include/volk/volk_16i_convert_8i_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Converts the input 16 bit integer data into 8 bit integer data
diff --git a/volk/include/volk/volk_16i_max_star_16i_a16.h b/volk/include/volk/volk_16i_max_star_16i_a.h
index ff57bd2a1..6a4f63708 100644
--- a/volk/include/volk/volk_16i_max_star_16i_a16.h
+++ b/volk/include/volk/volk_16i_max_star_16i_a.h
@@ -1,18 +1,18 @@
-#ifndef INCLUDED_volk_16i_max_star_16i_a16_H
-#define INCLUDED_volk_16i_max_star_16i_a16_H
+#ifndef INCLUDED_volk_16i_max_star_16i_a_H
+#define INCLUDED_volk_16i_max_star_16i_a_H
 
 
 #include<inttypes.h>
 #include<stdio.h>	
 
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 
 #include<xmmintrin.h>
 #include<emmintrin.h>
 #include<tmmintrin.h>
 
-static inline  void volk_16i_max_star_16i_a16_ssse3(short* target, short* src0, unsigned int num_bytes) {
+static inline  void volk_16i_max_star_16i_a_ssse3(short* target, short* src0, unsigned int num_bytes) {
 
 
   
@@ -85,9 +85,9 @@ static inline  void volk_16i_max_star_16i_a16_ssse3(short* target, short* src0,
  
 #endif /*LV_HAVE_SSSE3*/
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
-static inline void volk_16i_max_star_16i_a16_generic(short* target, short* src0, unsigned int num_bytes) {
+static inline void volk_16i_max_star_16i_a_generic(short* target, short* src0, unsigned int num_bytes) {
 	
 	int i = 0;
 	
@@ -105,4 +105,4 @@ static inline void volk_16i_max_star_16i_a16_generic(short* target, short* src0,
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_16i_max_star_16i_a16_H*/
+#endif /*INCLUDED_volk_16i_max_star_16i_a_H*/
diff --git a/volk/include/volk/volk_16i_max_star_horizontal_16i_a16.h b/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h
index 695e08dbf..f60b33a41 100644
--- a/volk/include/volk/volk_16i_max_star_horizontal_16i_a16.h
+++ b/volk/include/volk/volk_16i_max_star_horizontal_16i_a.h
@@ -1,18 +1,18 @@
-#ifndef INCLUDED_volk_16i_max_star_horizontal_16i_a16_H
-#define INCLUDED_volk_16i_max_star_horizontal_16i_a16_H
+#ifndef INCLUDED_volk_16i_max_star_horizontal_16i_a_H
+#define INCLUDED_volk_16i_max_star_horizontal_16i_a_H
 
 
 #include<inttypes.h>
 #include<stdio.h>	
 
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 
 #include<xmmintrin.h>
 #include<emmintrin.h>
 #include<tmmintrin.h>
 
-static inline  void volk_16i_max_star_horizontal_16i_a16_ssse3(int16_t* target, int16_t* src0, unsigned int num_bytes) {
+static inline  void volk_16i_max_star_horizontal_16i_a_ssse3(int16_t* target, int16_t* src0, unsigned int num_bytes) {
 
   const static uint8_t shufmask0[16] = {0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x0d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
   const static uint8_t shufmask1[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x0d};
@@ -109,8 +109,8 @@ static inline  void volk_16i_max_star_horizontal_16i_a16_ssse3(int16_t* target,
 #endif /*LV_HAVE_SSSE3*/
 
 
-#if LV_HAVE_GENERIC
-static inline void volk_16i_max_star_horizontal_16i_a16_generic(int16_t* target, int16_t* src0, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_16i_max_star_horizontal_16i_a_generic(int16_t* target, int16_t* src0, unsigned int num_bytes) {
 	
 	int i = 0;
 	
@@ -127,4 +127,4 @@ static inline void volk_16i_max_star_horizontal_16i_a16_generic(int16_t* target,
 
 #endif /*LV_HAVE_GENERIC*/
 
-#endif /*INCLUDED_volk_16i_max_star_horizontal_16i_a16_H*/
+#endif /*INCLUDED_volk_16i_max_star_horizontal_16i_a_H*/
diff --git a/volk/include/volk/volk_16i_permute_and_scalar_add_a16.h b/volk/include/volk/volk_16i_permute_and_scalar_add_a.h
index e52a949fb..de36cee80 100644
--- a/volk/include/volk/volk_16i_permute_and_scalar_add_a16.h
+++ b/volk/include/volk/volk_16i_permute_and_scalar_add_a.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_16i_permute_and_scalar_add_a16_H
-#define INCLUDED_volk_16i_permute_and_scalar_add_a16_H
+#ifndef INCLUDED_volk_16i_permute_and_scalar_add_a_H
+#define INCLUDED_volk_16i_permute_and_scalar_add_a_H
 
 
 #include<inttypes.h>
@@ -8,12 +8,12 @@
 
 
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 
 #include<xmmintrin.h>
 #include<emmintrin.h>
 
-static inline  void volk_16i_permute_and_scalar_add_a16_sse2(short* target,  short* src0, short* permute_indexes, short* cntl0, short* cntl1, short* cntl2, short* cntl3, short* scalars, unsigned int num_bytes) {
+static inline  void volk_16i_permute_and_scalar_add_a_sse2(short* target,  short* src0, short* permute_indexes, short* cntl0, short* cntl1, short* cntl2, short* cntl3, short* scalars, unsigned int num_bytes) {
 	
 
   __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
@@ -116,8 +116,8 @@ static inline  void volk_16i_permute_and_scalar_add_a16_sse2(short* target,  sho
 #endif /*LV_HAVE_SSEs*/
 
 
-#if LV_HAVE_GENERIC
-static inline void volk_16i_permute_and_scalar_add_a16_generic(short* target, short* src0, short* permute_indexes, short* cntl0, short* cntl1, short* cntl2, short* cntl3, short* scalars, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_16i_permute_and_scalar_add_a_generic(short* target, short* src0, short* permute_indexes, short* cntl0, short* cntl1, short* cntl2, short* cntl3, short* scalars, unsigned int num_bytes) {
 	
 	int i = 0;
 	
@@ -136,4 +136,4 @@ static inline void volk_16i_permute_and_scalar_add_a16_generic(short* target, sh
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_16i_permute_and_scalar_add_a16_H*/
+#endif /*INCLUDED_volk_16i_permute_and_scalar_add_a_H*/
diff --git a/volk/include/volk/volk_16i_s32f_convert_32f_a16.h b/volk/include/volk/volk_16i_s32f_convert_32f_a.h
index 83fd26ff9..0555fdf00 100644
--- a/volk/include/volk/volk_16i_s32f_convert_32f_a16.h
+++ b/volk/include/volk/volk_16i_s32f_convert_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16i_s32f_convert_32f_a16_H
-#define INCLUDED_volk_16i_s32f_convert_32f_a16_H
+#ifndef INCLUDED_volk_16i_s32f_convert_32f_a_H
+#define INCLUDED_volk_16i_s32f_convert_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -14,7 +14,7 @@
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_16i_s32f_convert_32f_a16_sse4_1(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_16i_s32f_convert_32f_a_sse4_1(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int eighthPoints = num_points / 8;
     
@@ -58,7 +58,7 @@ static inline void volk_16i_s32f_convert_32f_a16_sse4_1(float* outputVector, con
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 
   /*!
@@ -68,7 +68,7 @@ static inline void volk_16i_s32f_convert_32f_a16_sse4_1(float* outputVector, con
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_16i_s32f_convert_32f_a16_sse(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_16i_s32f_convert_32f_a_sse(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
     
@@ -94,7 +94,7 @@ static inline void volk_16i_s32f_convert_32f_a16_sse(float* outputVector, const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 16 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 16 bit input data buffer
@@ -102,7 +102,7 @@ static inline void volk_16i_s32f_convert_32f_a16_sse(float* outputVector, const
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_16i_s32f_convert_32f_a16_generic(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_16i_s32f_convert_32f_a_generic(float* outputVector, const int16_t* inputVector, const float scalar, unsigned int num_points){
   float* outputVectorPtr = outputVector;
   const int16_t* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -116,4 +116,4 @@ static inline void volk_16i_s32f_convert_32f_a16_generic(float* outputVector, co
 
 
 
-#endif /* INCLUDED_volk_16i_s32f_convert_32f_a16_H */
+#endif /* INCLUDED_volk_16i_s32f_convert_32f_a_H */
diff --git a/volk/include/volk/volk_16i_s32f_convert_32f_u.h b/volk/include/volk/volk_16i_s32f_convert_32f_u.h
index 8f0dd0083..d34acc091 100644
--- a/volk/include/volk/volk_16i_s32f_convert_32f_u.h
+++ b/volk/include/volk/volk_16i_s32f_convert_32f_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -59,7 +59,7 @@ static inline void volk_16i_s32f_convert_32f_u_sse4_1(float* outputVector, const
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 
   /*!
@@ -96,7 +96,7 @@ static inline void volk_16i_s32f_convert_32f_u_sse(float* outputVector, const in
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 16 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 16 bit input data buffer
diff --git a/volk/include/volk/volk_16i_x4_quad_max_star_16i_a16.h b/volk/include/volk/volk_16i_x4_quad_max_star_16i_a.h
index e4ec5ab4e..2688aff04 100644
--- a/volk/include/volk/volk_16i_x4_quad_max_star_16i_a16.h
+++ b/volk/include/volk/volk_16i_x4_quad_max_star_16i_a.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_16i_x4_quad_max_star_16i_a16_H
-#define INCLUDED_volk_16i_x4_quad_max_star_16i_a16_H
+#ifndef INCLUDED_volk_16i_x4_quad_max_star_16i_a_H
+#define INCLUDED_volk_16i_x4_quad_max_star_16i_a_H
 
 
 #include<inttypes.h>
@@ -9,11 +9,11 @@
 
 
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 
 #include<emmintrin.h>
 
-static inline  void volk_16i_x4_quad_max_star_16i_a16_sse2(short* target, short* src0, short* src1, short* src2, short* src3, unsigned int num_bytes) {
+static inline  void volk_16i_x4_quad_max_star_16i_a_sse2(short* target, short* src0, short* src1, short* src2, short* src3, unsigned int num_bytes) {
 	
 
 
@@ -96,9 +96,9 @@ static inline  void volk_16i_x4_quad_max_star_16i_a16_sse2(short* target, short*
 
 	/*asm volatile
 		(
-		 "volk_16i_x4_quad_max_star_16i_a16_sse2_L1:\n\t"
+		 "volk_16i_x4_quad_max_star_16i_a_sse2_L1:\n\t"
 		 "cmp $0, %[bound]\n\t"
-		 "je volk_16i_x4_quad_max_star_16i_a16_sse2_END\n\t"
+		 "je volk_16i_x4_quad_max_star_16i_a_sse2_END\n\t"
 
 		 "movaps (%[src0]), %%xmm1\n\t"
 		 "movaps (%[src1]), %%xmm2\n\t"
@@ -143,9 +143,9 @@ static inline  void volk_16i_x4_quad_max_star_16i_a16_sse2(short* target, short*
 
 		 "movaps %%xmm1, (%[target])\n\t"
 		 "addw $16, %[target]\n\t"
-		 "jmp volk_16i_x4_quad_max_star_16i_a16_sse2_L1\n\t"
+		 "jmp volk_16i_x4_quad_max_star_16i_a_sse2_L1\n\t"
 		 
-		 "volk_16i_x4_quad_max_star_16i_a16_sse2_END:\n\t"
+		 "volk_16i_x4_quad_max_star_16i_a_sse2_END:\n\t"
 		 :
 		 :[bound]"r"(bound), [src0]"r"(src0), [src1]"r"(src1), [src2]"r"(src2), [src3]"r"(src3), [target]"r"(target)
 		 :
@@ -167,8 +167,8 @@ static inline  void volk_16i_x4_quad_max_star_16i_a16_sse2(short* target, short*
 #endif /*LV_HAVE_SSE2*/
 
 
-#if LV_HAVE_GENERIC
-static inline void volk_16i_x4_quad_max_star_16i_a16_generic(short* target, short* src0, short* src1, short* src2, short* src3, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_16i_x4_quad_max_star_16i_a_generic(short* target, short* src0, short* src1, short* src2, short* src3, unsigned int num_bytes) {
 	
 	int i = 0;
 	
@@ -188,4 +188,4 @@ static inline void volk_16i_x4_quad_max_star_16i_a16_generic(short* target, shor
 
 #endif /*LV_HAVE_GENERIC*/
 
-#endif /*INCLUDED_volk_16i_x4_quad_max_star_16i_a16_H*/
+#endif /*INCLUDED_volk_16i_x4_quad_max_star_16i_a_H*/
diff --git a/volk/include/volk/volk_16i_x5_add_quad_16i_x4_a16.h b/volk/include/volk/volk_16i_x5_add_quad_16i_x4_a.h
index 5744ca3a6..e4c9f17ed 100644
--- a/volk/include/volk/volk_16i_x5_add_quad_16i_x4_a16.h
+++ b/volk/include/volk/volk_16i_x5_add_quad_16i_x4_a.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_16i_x5_add_quad_16i_x4_a16_H
-#define INCLUDED_volk_16i_x5_add_quad_16i_x4_a16_H
+#ifndef INCLUDED_volk_16i_x5_add_quad_16i_x4_a_H
+#define INCLUDED_volk_16i_x5_add_quad_16i_x4_a_H
 
 
 #include<inttypes.h>
@@ -9,11 +9,11 @@
 
 
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include<xmmintrin.h>
 #include<emmintrin.h>
 
-static inline  void volk_16i_x5_add_quad_16i_x4_a16_sse2(short* target0, short* target1, short* target2, short* target3, short* src0, short* src1, short* src2, short* src3, short* src4, unsigned int num_bytes) {
+static inline  void volk_16i_x5_add_quad_16i_x4_a_sse2(short* target0, short* target1, short* target2, short* target3, short* src0, short* src1, short* src2, short* src3, short* src4, unsigned int num_bytes) {
   
   __m128i xmm0, xmm1, xmm2, xmm3, xmm4;
   __m128i *p_target0, *p_target1, *p_target2, *p_target3,  *p_src0, *p_src1, *p_src2, *p_src3, *p_src4;
@@ -65,9 +65,9 @@ static inline  void volk_16i_x5_add_quad_16i_x4_a16_sse2(short* target0, short*
   }
     /*asm volatile
 		(
-		 ".%=volk_16i_x5_add_quad_16i_x4_a16_sse2_L1:\n\t"
+		 ".%=volk_16i_x5_add_quad_16i_x4_a_sse2_L1:\n\t"
 		 "cmp $0, %[bound]\n\t"
-		 "je .%=volk_16i_x5_add_quad_16i_x4_a16_sse2_END\n\t"
+		 "je .%=volk_16i_x5_add_quad_16i_x4_a_sse2_END\n\t"
 		 "movaps (%[src0]), %%xmm1\n\t"
 		 "movaps (%[src1]), %%xmm2\n\t"
 		 "movaps (%[src2]), %%xmm3\n\t"
@@ -91,8 +91,8 @@ static inline  void volk_16i_x5_add_quad_16i_x4_a16_sse2(short* target0, short*
 		 "add $16, %[target1]\n\t"
 		 "add $16, %[target2]\n\t"
 		 "add $16, %[target3]\n\t"
-		 "jmp .%=volk_16i_x5_add_quad_16i_x4_a16_sse2_L1\n\t"
-		 ".%=volk_16i_x5_add_quad_16i_x4_a16_sse2_END:\n\t"
+		 "jmp .%=volk_16i_x5_add_quad_16i_x4_a_sse2_L1\n\t"
+		 ".%=volk_16i_x5_add_quad_16i_x4_a_sse2_END:\n\t"
 		 :
 		 :[bound]"r"(bound), [src0]"r"(src0), [src1]"r"(src1), [src2]"r"(src2), [src3]"r"(src3), [src4]"r"(src4), [target0]"r"(target0), [target1]"r"(target1), [target2]"r"(target2), [target3]"r"(target3)
 		 :"xmm1", "xmm2", "xmm3", "xmm4", "xmm5"
@@ -111,9 +111,9 @@ static inline  void volk_16i_x5_add_quad_16i_x4_a16_sse2(short* target0, short*
 #endif /*LV_HAVE_SSE2*/
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
-static inline void volk_16i_x5_add_quad_16i_x4_a16_generic(short* target0, short* target1, short* target2, short* target3, short* src0, short* src1, short* src2, short* src3, short* src4, unsigned int num_bytes) {
+static inline void volk_16i_x5_add_quad_16i_x4_a_generic(short* target0, short* target1, short* target2, short* target3, short* src0, short* src1, short* src2, short* src3, short* src4, unsigned int num_bytes) {
 	
 	int i = 0;
 	
@@ -133,4 +133,4 @@ static inline void volk_16i_x5_add_quad_16i_x4_a16_generic(short* target0, short
 
 
 
-#endif /*INCLUDED_volk_16i_x5_add_quad_16i_x4_a16_H*/
+#endif /*INCLUDED_volk_16i_x5_add_quad_16i_x4_a_H*/
diff --git a/volk/include/volk/volk_16ic_deinterleave_16i_x2_a16.h b/volk/include/volk/volk_16ic_deinterleave_16i_x2_a.h
index 7e08bf182..cdd60235e 100644
--- a/volk/include/volk/volk_16ic_deinterleave_16i_x2_a16.h
+++ b/volk/include/volk/volk_16ic_deinterleave_16i_x2_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16ic_deinterleave_16i_x2_a16_H
-#define INCLUDED_volk_16ic_deinterleave_16i_x2_a16_H
+#ifndef INCLUDED_volk_16ic_deinterleave_16i_x2_a_H
+#define INCLUDED_volk_16ic_deinterleave_16i_x2_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 #include <tmmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I & Q vector data
@@ -13,7 +13,7 @@
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_16i_x2_a16_ssse3(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_16i_x2_a_ssse3(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -52,7 +52,7 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_ssse3(int16_t* iBuffer, int
 }
 #endif /* LV_HAVE_SSSE3 */
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I & Q vector data
@@ -61,7 +61,7 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_ssse3(int16_t* iBuffer, int
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_16i_x2_a16_sse2(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_16i_x2_a_sse2(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int16_t* complexVectorPtr = (int16_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -120,7 +120,7 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_sse2(int16_t* iBuffer, int1
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 16 bit vector into I & Q vector data
   \param complexVector The complex input vector
@@ -128,7 +128,7 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_sse2(int16_t* iBuffer, int1
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_16i_x2_a16_generic(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_16i_x2_a_generic(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   const int16_t* complexVectorPtr = (const int16_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
   int16_t* qBufferPtr = qBuffer;
@@ -140,7 +140,7 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_generic(int16_t* iBuffer, i
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Deinterleaves the complex 16 bit vector into I & Q vector data
   \param complexVector The complex input vector
@@ -148,11 +148,11 @@ static inline void volk_16ic_deinterleave_16i_x2_a16_generic(int16_t* iBuffer, i
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-extern void volk_16ic_deinterleave_16i_x2_a16_orc_impl(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points);
-static inline void volk_16ic_deinterleave_16i_x2_a16_orc(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
-    volk_16ic_deinterleave_16i_x2_a16_orc_impl(iBuffer, qBuffer, complexVector, num_points);
+extern void volk_16ic_deinterleave_16i_x2_a_orc_impl(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points);
+static inline void volk_16ic_deinterleave_16i_x2_a_orc(int16_t* iBuffer, int16_t* qBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+    volk_16ic_deinterleave_16i_x2_a_orc_impl(iBuffer, qBuffer, complexVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16ic_deinterleave_16i_x2_a16_H */
+#endif /* INCLUDED_volk_16ic_deinterleave_16i_x2_a_H */
diff --git a/volk/include/volk/volk_16ic_deinterleave_real_16i_a16.h b/volk/include/volk/volk_16ic_deinterleave_real_16i_a.h
index 388c00592..2b99e068e 100644
--- a/volk/include/volk/volk_16ic_deinterleave_real_16i_a16.h
+++ b/volk/include/volk/volk_16ic_deinterleave_real_16i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16ic_deinterleave_real_16i_a16_H
-#define INCLUDED_volk_16ic_deinterleave_real_16i_a16_H
+#ifndef INCLUDED_volk_16ic_deinterleave_real_16i_a_H
+#define INCLUDED_volk_16ic_deinterleave_real_16i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 #include <tmmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_real_16i_a16_ssse3(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_real_16i_a_ssse3(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int16_t* complexVectorPtr = (int16_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -47,7 +47,7 @@ static inline void volk_16ic_deinterleave_real_16i_a16_ssse3(int16_t* iBuffer, c
 #endif /* LV_HAVE_SSSE3 */
 
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I vector data
@@ -55,7 +55,7 @@ static inline void volk_16ic_deinterleave_real_16i_a16_ssse3(int16_t* iBuffer, c
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_real_16i_a16_sse2(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_real_16i_a_sse2(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int16_t* complexVectorPtr = (int16_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -96,14 +96,14 @@ static inline void volk_16ic_deinterleave_real_16i_a16_sse2(int16_t* iBuffer, co
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 16 bit vector into I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_real_16i_a16_generic(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_real_16i_a_generic(int16_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int16_t* complexVectorPtr = (int16_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -117,4 +117,4 @@ static inline void volk_16ic_deinterleave_real_16i_a16_generic(int16_t* iBuffer,
 
 
 
-#endif /* INCLUDED_volk_16ic_deinterleave_real_16i_a16_H */
+#endif /* INCLUDED_volk_16ic_deinterleave_real_16i_a_H */
diff --git a/volk/include/volk/volk_16ic_deinterleave_real_8i_a16.h b/volk/include/volk/volk_16ic_deinterleave_real_8i_a.h
index 55a25702e..cd2fabb52 100644
--- a/volk/include/volk/volk_16ic_deinterleave_real_8i_a16.h
+++ b/volk/include/volk/volk_16ic_deinterleave_real_8i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16ic_deinterleave_real_8i_a16_H
-#define INCLUDED_volk_16ic_deinterleave_real_8i_a16_H
+#ifndef INCLUDED_volk_16ic_deinterleave_real_8i_a_H
+#define INCLUDED_volk_16ic_deinterleave_real_8i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 #include <tmmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into 8 bit I vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_real_8i_a16_ssse3(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_real_8i_a_ssse3(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int8_t* iBufferPtr = iBuffer;
@@ -59,14 +59,14 @@ static inline void volk_16ic_deinterleave_real_8i_a16_ssse3(int8_t* iBuffer, con
 }
 #endif /* LV_HAVE_SSSE3 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 16 bit vector into 8 bit I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_deinterleave_real_8i_a16_generic(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_deinterleave_real_8i_a_generic(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   int16_t* complexVectorPtr = (int16_t*)complexVector;
   int8_t* iBufferPtr = iBuffer;
@@ -77,18 +77,18 @@ static inline void volk_16ic_deinterleave_real_8i_a16_generic(int8_t* iBuffer, c
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Deinterleaves the complex 16 bit vector into 8 bit I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-extern void volk_16ic_deinterleave_real_8i_a16_orc_impl(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points);
-static inline void volk_16ic_deinterleave_real_8i_a16_orc(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
-    volk_16ic_deinterleave_real_8i_a16_orc_impl(iBuffer, complexVector, num_points);
+extern void volk_16ic_deinterleave_real_8i_a_orc_impl(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points);
+static inline void volk_16ic_deinterleave_real_8i_a_orc(int8_t* iBuffer, const lv_16sc_t* complexVector, unsigned int num_points){
+    volk_16ic_deinterleave_real_8i_a_orc_impl(iBuffer, complexVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16ic_deinterleave_real_8i_a16_H */
+#endif /* INCLUDED_volk_16ic_deinterleave_real_8i_a_H */
diff --git a/volk/include/volk/volk_16ic_magnitude_16i_a16.h b/volk/include/volk/volk_16ic_magnitude_16i_a.h
index bdcace750..a6951e967 100644
--- a/volk/include/volk/volk_16ic_magnitude_16i_a16.h
+++ b/volk/include/volk/volk_16ic_magnitude_16i_a.h
@@ -1,11 +1,12 @@
-#ifndef INCLUDED_volk_16ic_magnitude_16i_a16_H
-#define INCLUDED_volk_16ic_magnitude_16i_a16_H
+#ifndef INCLUDED_volk_16ic_magnitude_16i_a_H
+#define INCLUDED_volk_16ic_magnitude_16i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -13,7 +14,7 @@
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_magnitude_16i_a16_sse3(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_magnitude_16i_a_sse3(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
    
@@ -25,8 +26,8 @@ static inline void volk_16ic_magnitude_16i_a16_sse3(int16_t* magnitudeVector, co
 
   __m128 cplxValue1, cplxValue2, result;
 
-  float inputFloatBuffer[8] __attribute__((aligned(128)));
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float inputFloatBuffer[8];
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
 
@@ -76,7 +77,7 @@ static inline void volk_16ic_magnitude_16i_a16_sse3(int16_t* magnitudeVector, co
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -84,7 +85,7 @@ static inline void volk_16ic_magnitude_16i_a16_sse3(int16_t* magnitudeVector, co
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_magnitude_16i_a16_sse(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_magnitude_16i_a_sse(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -96,8 +97,8 @@ static inline void volk_16ic_magnitude_16i_a16_sse(int16_t* magnitudeVector, con
 
   __m128 cplxValue1, cplxValue2, iValue, qValue, result;
 
-  float inputFloatBuffer[4] __attribute__((aligned(128)));
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float inputFloatBuffer[4];
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
 
@@ -153,14 +154,14 @@ static inline void volk_16ic_magnitude_16i_a16_sse(int16_t* magnitudeVector, con
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_magnitude_16i_a16_generic(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
+static inline void volk_16ic_magnitude_16i_a_generic(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
   const int16_t* complexVectorPtr = (const int16_t*)complexVector;
   int16_t* magnitudeVectorPtr = magnitudeVector;
   unsigned int number = 0;
@@ -173,18 +174,18 @@ static inline void volk_16ic_magnitude_16i_a16_generic(int16_t* magnitudeVector,
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC_DISABLED
+#ifdef LV_HAVE_ORC_DISABLED
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-extern void volk_16ic_magnitude_16i_a16_orc_impl(int16_t* magnitudeVector, const lv_16sc_t* complexVector, float scalar, unsigned int num_points);
-static inline void volk_16ic_magnitude_16i_a16_orc(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
-    volk_16ic_magnitude_16i_a16_orc_impl(magnitudeVector, complexVector, 32768.0, num_points);
+extern void volk_16ic_magnitude_16i_a_orc_impl(int16_t* magnitudeVector, const lv_16sc_t* complexVector, float scalar, unsigned int num_points);
+static inline void volk_16ic_magnitude_16i_a_orc(int16_t* magnitudeVector, const lv_16sc_t* complexVector, unsigned int num_points){
+    volk_16ic_magnitude_16i_a_orc_impl(magnitudeVector, complexVector, 32768.0, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16ic_magnitude_16i_a16_H */
+#endif /* INCLUDED_volk_16ic_magnitude_16i_a_H */
diff --git a/volk/include/volk/volk_16ic_s32f_deinterleave_32f_x2_a16.h b/volk/include/volk/volk_16ic_s32f_deinterleave_32f_x2_a.h
index 606de2fc5..e73d405e0 100644
--- a/volk/include/volk/volk_16ic_s32f_deinterleave_32f_x2_a16.h
+++ b/volk/include/volk/volk_16ic_s32f_deinterleave_32f_x2_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a16_H
-#define INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a16_H
+#ifndef INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a_H
+#define INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Converts the complex 16 bit vector into floats,scales each data point, and deinterleaves into I & Q vector data
@@ -14,7 +15,7 @@
     \param scalar The data value to be divided against each input data value of the input complex vector
     \param num_points The number of complex data values to be deinterleaved
   */
-static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_deinterleave_32f_x2_a_sse(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
     float* iBufferPtr = iBuffer;
     float* qBufferPtr = qBuffer;
 
@@ -25,7 +26,7 @@ static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, fl
     __m128 invScalar = _mm_set_ps1(1.0/scalar);
     int16_t* complexVectorPtr = (int16_t*)complexVector;
 
-    float floatBuffer[8] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float floatBuffer[8];
 
     for(;number < quarterPoints; number++){
       
@@ -68,7 +69,7 @@ static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, fl
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the complex 16 bit vector into floats,scales each data point, and deinterleaves into I & Q vector data
     \param complexVector The complex input vector
@@ -77,7 +78,7 @@ static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, fl
     \param scalar The data value to be divided against each input data value of the input complex vector
     \param num_points The number of complex data values to be deinterleaved
   */
-static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_generic(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_deinterleave_32f_x2_a_generic(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   const int16_t* complexVectorPtr = (const int16_t*)complexVector;
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
@@ -89,7 +90,7 @@ static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_generic(float* iBuffer
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Converts the complex 16 bit vector into floats,scales each data point, and deinterleaves into I & Q vector data
     \param complexVector The complex input vector
@@ -98,11 +99,11 @@ static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_generic(float* iBuffer
     \param scalar The data value to be divided against each input data value of the input complex vector
     \param num_points The number of complex data values to be deinterleaved
   */
-extern void volk_16ic_s32f_deinterleave_32f_x2_a16_orc_impl(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points);
-static inline void volk_16ic_s32f_deinterleave_32f_x2_a16_orc(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
-    volk_16ic_s32f_deinterleave_32f_x2_a16_orc_impl(iBuffer, qBuffer, complexVector, scalar, num_points);
+extern void volk_16ic_s32f_deinterleave_32f_x2_a_orc_impl(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points);
+static inline void volk_16ic_s32f_deinterleave_32f_x2_a_orc(float* iBuffer, float* qBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+    volk_16ic_s32f_deinterleave_32f_x2_a_orc_impl(iBuffer, qBuffer, complexVector, scalar, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a16_H */
+#endif /* INCLUDED_volk_16ic_s32f_deinterleave_32f_x2_a_H */
diff --git a/volk/include/volk/volk_16ic_s32f_deinterleave_real_32f_a16.h b/volk/include/volk/volk_16ic_s32f_deinterleave_real_32f_a.h
index 62331e496..1630cb0ed 100644
--- a/volk/include/volk/volk_16ic_s32f_deinterleave_real_32f_a16.h
+++ b/volk/include/volk/volk_16ic_s32f_deinterleave_real_32f_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a16_H
-#define INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a16_H
+#ifndef INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a_H
+#define INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I float vector data
@@ -13,7 +14,7 @@
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_deinterleave_real_32f_a_sse4_1(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
 
   unsigned int number = 0;
@@ -52,7 +53,7 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffe
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex 16 bit vector into I float vector data
@@ -61,7 +62,7 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffe
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_deinterleave_real_32f_a_sse(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
 
   unsigned int number = 0;
@@ -72,7 +73,7 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer,
   __m128 invScalar = _mm_set_ps1(iScalar);
   int16_t* complexVectorPtr = (int16_t*)complexVector;
 
-  float floatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
   for(;number < quarterPoints; number++){
     floatBuffer[0] = (float)(*complexVectorPtr); complexVectorPtr += 2;
@@ -99,7 +100,7 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer,
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 16 bit vector into I float vector data
   \param complexVector The complex input vector
@@ -107,7 +108,7 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer,
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_16ic_s32f_deinterleave_real_32f_a16_generic(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_deinterleave_real_32f_a_generic(float* iBuffer, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const int16_t* complexVectorPtr = (const int16_t*)complexVector;
   float* iBufferPtr = iBuffer;
@@ -122,4 +123,4 @@ static inline void volk_16ic_s32f_deinterleave_real_32f_a16_generic(float* iBuff
 
 
 
-#endif /* INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a16_H */
+#endif /* INCLUDED_volk_16ic_s32f_deinterleave_real_32f_a_H */
diff --git a/volk/include/volk/volk_16ic_s32f_magnitude_32f_a16.h b/volk/include/volk/volk_16ic_s32f_magnitude_32f_a.h
index ae64efbeb..35406e2cb 100644
--- a/volk/include/volk/volk_16ic_s32f_magnitude_32f_a16.h
+++ b/volk/include/volk/volk_16ic_s32f_magnitude_32f_a.h
@@ -1,11 +1,12 @@
-#ifndef INCLUDED_volk_16ic_s32f_magnitude_32f_a16_H
-#define INCLUDED_volk_16ic_s32f_magnitude_32f_a16_H
+#ifndef INCLUDED_volk_16ic_s32f_magnitude_32f_a_H
+#define INCLUDED_volk_16ic_s32f_magnitude_32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -14,7 +15,7 @@
   \param scalar The data value to be divided against each input data value of the input complex vector
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_s32f_magnitude_32f_a16_sse3(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_magnitude_32f_a_sse3(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
   
@@ -25,7 +26,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse3(float* magnitudeVector,
 
   __m128 cplxValue1, cplxValue2, result;
 
-  float inputFloatBuffer[8] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float inputFloatBuffer[8];
 
   for(;number < quarterPoints; number++){
 
@@ -70,7 +71,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse3(float* magnitudeVector,
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -79,7 +80,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse3(float* magnitudeVector,
   \param scalar The data value to be divided against each input data value of the input complex vector
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_s32f_magnitude_32f_a16_sse(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_magnitude_32f_a_sse(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -91,7 +92,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse(float* magnitudeVector,
 
   __m128 cplxValue1, cplxValue2, result, re, im;
 
-  float inputFloatBuffer[8] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float inputFloatBuffer[8];
 
   for(;number < quarterPoints; number++){
     inputFloatBuffer[0] = (float)(complexVectorPtr[0]);
@@ -140,7 +141,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse(float* magnitudeVector,
  
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
@@ -148,7 +149,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_sse(float* magnitudeVector,
   \param scalar The data value to be divided against each input data value of the input complex vector
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_16ic_s32f_magnitude_32f_a16_generic(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_16ic_s32f_magnitude_32f_a_generic(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
   const int16_t* complexVectorPtr = (const int16_t*)complexVector;
   float* magnitudeVectorPtr = magnitudeVector;
   unsigned int number = 0;
@@ -161,7 +162,7 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_generic(float* magnitudeVect
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC_DISABLED
+#ifdef LV_HAVE_ORC_DISABLED
 /*!
   \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
@@ -169,11 +170,11 @@ static inline void volk_16ic_s32f_magnitude_32f_a16_generic(float* magnitudeVect
   \param scalar The data value to be divided against each input data value of the input complex vector
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-extern void volk_16ic_s32f_magnitude_32f_a16_orc_impl(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points);
-static inline void volk_16ic_s32f_magnitude_32f_a16_orc(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
-    volk_16ic_s32f_magnitude_32f_a16_orc_impl(magnitudeVector, complexVector, scalar, num_points);
+extern void volk_16ic_s32f_magnitude_32f_a_orc_impl(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points);
+static inline void volk_16ic_s32f_magnitude_32f_a_orc(float* magnitudeVector, const lv_16sc_t* complexVector, const float scalar, unsigned int num_points){
+    volk_16ic_s32f_magnitude_32f_a_orc_impl(magnitudeVector, complexVector, scalar, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16ic_s32f_magnitude_32f_a16_H */
+#endif /* INCLUDED_volk_16ic_s32f_magnitude_32f_a_H */
diff --git a/volk/include/volk/volk_16u_byteswap_a16.h b/volk/include/volk/volk_16u_byteswap_a.h
index c8128dbab..75c7ef0f3 100644
--- a/volk/include/volk/volk_16u_byteswap_a16.h
+++ b/volk/include/volk/volk_16u_byteswap_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_16u_byteswap_a16_H
-#define INCLUDED_volk_16u_byteswap_a16_H
+#ifndef INCLUDED_volk_16u_byteswap_a_H
+#define INCLUDED_volk_16u_byteswap_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 
 /*!
@@ -12,7 +12,7 @@
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_16u_byteswap_a16_sse2(uint16_t* intsToSwap, unsigned int num_points){
+static inline void volk_16u_byteswap_a_sse2(uint16_t* intsToSwap, unsigned int num_points){
   unsigned int number = 0;
   uint16_t* inputPtr = intsToSwap;
   __m128i input, left, right, output;
@@ -43,13 +43,13 @@ static inline void volk_16u_byteswap_a16_sse2(uint16_t* intsToSwap, unsigned int
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Byteswaps (in-place) an aligned vector of int16_t's.
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_16u_byteswap_a16_generic(uint16_t* intsToSwap, unsigned int num_points){
+static inline void volk_16u_byteswap_a_generic(uint16_t* intsToSwap, unsigned int num_points){
   unsigned int point;
   uint16_t* inputPtr = intsToSwap;
   for(point = 0; point < num_points; point++){
@@ -61,17 +61,17 @@ static inline void volk_16u_byteswap_a16_generic(uint16_t* intsToSwap, unsigned
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Byteswaps (in-place) an aligned vector of int16_t's.
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-extern void volk_16u_byteswap_a16_orc_impl(uint16_t* intsToSwap, unsigned int num_points);
-static inline void volk_16u_byteswap_a16_orc(uint16_t* intsToSwap, unsigned int num_points){
-    volk_16u_byteswap_a16_orc_impl(intsToSwap, num_points);
+extern void volk_16u_byteswap_a_orc_impl(uint16_t* intsToSwap, unsigned int num_points);
+static inline void volk_16u_byteswap_a_orc(uint16_t* intsToSwap, unsigned int num_points){
+    volk_16u_byteswap_a_orc_impl(intsToSwap, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_16u_byteswap_a16_H */
+#endif /* INCLUDED_volk_16u_byteswap_a_H */
diff --git a/volk/include/volk/volk_32f_accumulator_s32f_a16.h b/volk/include/volk/volk_32f_accumulator_s32f_a.h
index 4a3588e6d..7ce0d1c80 100644
--- a/volk/include/volk/volk_32f_accumulator_s32f_a16.h
+++ b/volk/include/volk/volk_32f_accumulator_s32f_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32f_accumulator_s32f_a16_H
-#define INCLUDED_volk_32f_accumulator_s32f_a16_H
+#ifndef INCLUDED_volk_32f_accumulator_s32f_a_H
+#define INCLUDED_volk_32f_accumulator_s32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Accumulates the values in the input buffer
@@ -12,13 +13,13 @@
   \param inputBuffer The buffer of data to be accumulated
   \param num_points The number of values in inputBuffer to be accumulated
 */
-static inline void volk_32f_accumulator_s32f_a16_sse(float* result, const float* inputBuffer, unsigned int num_points){
+static inline void volk_32f_accumulator_s32f_a_sse(float* result, const float* inputBuffer, unsigned int num_points){
   float returnValue = 0;
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
   const float* aPtr = inputBuffer;
-  float tempBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float tempBuffer[4];
   
   __m128 accumulator = _mm_setzero_ps();
   __m128 aVal = _mm_setzero_ps();
@@ -42,14 +43,14 @@ static inline void volk_32f_accumulator_s32f_a16_sse(float* result, const float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Accumulates the values in the input buffer
   \param result The accumulated result
   \param inputBuffer The buffer of data to be accumulated
   \param num_points The number of values in inputBuffer to be accumulated
 */
-static inline void volk_32f_accumulator_s32f_a16_generic(float* result, const float* inputBuffer, unsigned int num_points){
+static inline void volk_32f_accumulator_s32f_a_generic(float* result, const float* inputBuffer, unsigned int num_points){
   const float* aPtr = inputBuffer;
   unsigned int number = 0;
   float returnValue = 0;
@@ -64,4 +65,4 @@ static inline void volk_32f_accumulator_s32f_a16_generic(float* result, const fl
 
 
 
-#endif /* INCLUDED_volk_32f_accumulator_s32f_a16_H */
+#endif /* INCLUDED_volk_32f_accumulator_s32f_a_H */
diff --git a/volk/include/volk/volk_32f_convert_64f_a16.h b/volk/include/volk/volk_32f_convert_64f_a.h
index c303dc118..dda646409 100644
--- a/volk/include/volk/volk_32f_convert_64f_a16.h
+++ b/volk/include/volk/volk_32f_convert_64f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_convert_64f_a16_H
-#define INCLUDED_volk_32f_convert_64f_a16_H
+#ifndef INCLUDED_volk_32f_convert_64f_a_H
+#define INCLUDED_volk_32f_convert_64f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Converts the float values into double values
@@ -12,7 +12,7 @@
     \param fVector The float vector values to be converted
     \param num_points The number of points in the two vectors to be converted
   */
-static inline void volk_32f_convert_64f_a16_sse2(double* outputVector, const float* inputVector, unsigned int num_points){
+static inline void volk_32f_convert_64f_a_sse2(double* outputVector, const float* inputVector, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -53,7 +53,7 @@ static inline void volk_32f_convert_64f_a16_sse2(double* outputVector, const flo
   \param fVector The float vector values to be converted
   \param num_points The number of points in the two vectors to be converted
 */
-static inline void volk_32f_convert_64f_a16_generic(double* outputVector, const float* inputVector, unsigned int num_points){
+static inline void volk_32f_convert_64f_a_generic(double* outputVector, const float* inputVector, unsigned int num_points){
   double* outputVectorPtr = outputVector;
   const float* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -67,4 +67,4 @@ static inline void volk_32f_convert_64f_a16_generic(double* outputVector, const
 
 
 
-#endif /* INCLUDED_volk_32f_convert_64f_a16_H */
+#endif /* INCLUDED_volk_32f_convert_64f_a_H */
diff --git a/volk/include/volk/volk_32f_convert_64f_u.h b/volk/include/volk/volk_32f_convert_64f_u.h
index a825767de..387baa3b9 100644
--- a/volk/include/volk/volk_32f_convert_64f_u.h
+++ b/volk/include/volk/volk_32f_convert_64f_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Converts the float values into double values
diff --git a/volk/include/volk/volk_32f_index_max_16u_a16.h b/volk/include/volk/volk_32f_index_max_16u_a.h
index d070e17d5..3e0cf1d65 100644
--- a/volk/include/volk/volk_32f_index_max_16u_a16.h
+++ b/volk/include/volk/volk_32f_index_max_16u_a.h
@@ -1,14 +1,15 @@
-#ifndef INCLUDED_volk_32f_index_max_16u_a16_H
-#define INCLUDED_volk_32f_index_max_16u_a16_H
+#ifndef INCLUDED_volk_32f_index_max_16u_a_H
+#define INCLUDED_volk_32f_index_max_16u_a_H
 
 #include <volk/volk_common.h>
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include<smmintrin.h>
 
-static inline void volk_32f_index_max_16u_a16_sse4_1(unsigned int* target, const float* src0, unsigned int num_points) {
+static inline void volk_32f_index_max_16u_a_sse4_1(unsigned int* target, const float* src0, unsigned int num_points) {
   if(num_points > 0){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
@@ -25,8 +26,8 @@ static inline void volk_32f_index_max_16u_a16_sse4_1(unsigned int* target, const
     __m128 compareResults;
     __m128 currentValues;
 
-    float maxValuesBuffer[4] __attribute__((aligned(16)));
-    float maxIndexesBuffer[4] __attribute__((aligned(16)));
+    __VOLK_ATTR_ALIGNED(16) float maxValuesBuffer[4];
+    __VOLK_ATTR_ALIGNED(16) float maxIndexesBuffer[4];
 
     for(;number < quarterPoints; number++){
 
@@ -63,10 +64,10 @@ static inline void volk_32f_index_max_16u_a16_sse4_1(unsigned int* target, const
 
 #endif /*LV_HAVE_SSE4_1*/
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include<xmmintrin.h>
 
-static inline void volk_32f_index_max_16u_a16_sse(unsigned int* target, const float* src0, unsigned int num_points) {
+static inline void volk_32f_index_max_16u_a_sse(unsigned int* target, const float* src0, unsigned int num_points) {
   if(num_points > 0){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
@@ -83,8 +84,8 @@ static inline void volk_32f_index_max_16u_a16_sse(unsigned int* target, const fl
     __m128 compareResults;
     __m128 currentValues;
 
-    float maxValuesBuffer[4] __attribute__((aligned(16)));
-    float maxIndexesBuffer[4] __attribute__((aligned(16)));
+    __VOLK_ATTR_ALIGNED(16) float maxValuesBuffer[4];
+    __VOLK_ATTR_ALIGNED(16) float maxIndexesBuffer[4];
 
     for(;number < quarterPoints; number++){
 
@@ -122,8 +123,8 @@ static inline void volk_32f_index_max_16u_a16_sse(unsigned int* target, const fl
 
 #endif /*LV_HAVE_SSE*/
 
-#if LV_HAVE_GENERIC
-static inline void volk_32f_index_max_16u_a16_generic(unsigned int* target, const float* src0, unsigned int num_points) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_32f_index_max_16u_a_generic(unsigned int* target, const float* src0, unsigned int num_points) {
   if(num_points > 0){
     float max = src0[0];
     unsigned int index = 0;
@@ -145,4 +146,4 @@ static inline void volk_32f_index_max_16u_a16_generic(unsigned int* target, cons
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_32f_index_max_16u_a16_H*/
+#endif /*INCLUDED_volk_32f_index_max_16u_a_H*/
diff --git a/volk/include/volk/volk_32f_s32f_32f_fm_detect_32f_a16.h b/volk/include/volk/volk_32f_s32f_32f_fm_detect_32f_a.h
index ff4d5b19c..b25df75a1 100644
--- a/volk/include/volk/volk_32f_s32f_32f_fm_detect_32f_a16.h
+++ b/volk/include/volk/volk_32f_s32f_32f_fm_detect_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a16_H
-#define INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a16_H
+#ifndef INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a_H
+#define INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief performs the FM-detect differentiation on the input vector and stores the results in the output vector.
@@ -14,7 +14,7 @@
   \param saveValue A pointer to a float which contains the phase value of the sample before the first input sample.
   \param num_noints The number of real values in the input vector.
 */
-static inline void volk_32f_s32f_32f_fm_detect_32f_a16_sse(float* outputVector, const float* inputVector, const float bound, float* saveValue, unsigned int num_points){
+static inline void volk_32f_s32f_32f_fm_detect_32f_a_sse(float* outputVector, const float* inputVector, const float bound, float* saveValue, unsigned int num_points){
   if (num_points < 1) {
     return;
   }
@@ -78,7 +78,7 @@ static inline void volk_32f_s32f_32f_fm_detect_32f_a16_sse(float* outputVector,
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief performs the FM-detect differentiation on the input vector and stores the results in the output vector.
   \param outputVector The byte-aligned vector where the results will be stored.
@@ -87,7 +87,7 @@ static inline void volk_32f_s32f_32f_fm_detect_32f_a16_sse(float* outputVector,
   \param saveValue A pointer to a float which contains the phase value of the sample before the first input sample.
   \param num_points The number of real values in the input vector.
 */
-static inline void volk_32f_s32f_32f_fm_detect_32f_a16_generic(float* outputVector, const float* inputVector, const float bound, float* saveValue, unsigned int num_points){
+static inline void volk_32f_s32f_32f_fm_detect_32f_a_generic(float* outputVector, const float* inputVector, const float bound, float* saveValue, unsigned int num_points){
   if (num_points < 1) {
     return;
   }
@@ -117,4 +117,4 @@ static inline void volk_32f_s32f_32f_fm_detect_32f_a16_generic(float* outputVect
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_32f_fm_detect_32f_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f_a16.h b/volk/include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f_a.h
index 168245d65..b1902a8c0 100644
--- a/volk/include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f_a16.h
+++ b/volk/include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a16_H
-#define INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a16_H
+#ifndef INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a_H
+#define INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the spectral noise floor of an input power spectrum
@@ -16,12 +17,12 @@
   \param spectralExclusionValue The number of dB above the noise floor that a data point must be to be excluded from the noise floor calculation - default value is 20
   \param noiseFloorAmplitude The noise floor of the input spectrum, in dB
 */
-static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_sse(float* noiseFloorAmplitude, const float* realDataPoints, const float spectralExclusionValue, const unsigned int num_points){
+static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a_sse(float* noiseFloorAmplitude, const float* realDataPoints, const float spectralExclusionValue, const unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
   const float* dataPointsPtr = realDataPoints;
-  float avgPointsVector[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float avgPointsVector[4];
     
   __m128 dataPointsVal;
   __m128 avgPointsVal = _mm_setzero_ps();
@@ -87,7 +88,7 @@ static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_sse(float* no
   sumMean += avgPointsVector[3];
 
   // Calculate the number of valid bins from the remaning count
-  float validBinCountVector[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float validBinCountVector[4];
   _mm_store_ps(validBinCountVector, vValidBinCount);
 
   float validBinCount = 0;
@@ -116,7 +117,7 @@ static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_sse(float* no
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the spectral noise floor of an input power spectrum
 
@@ -127,7 +128,7 @@ static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_sse(float* no
   \param spectralExclusionValue The number of dB above the noise floor that a data point must be to be excluded from the noise floor calculation - default value is 20
   \param noiseFloorAmplitude The noise floor of the input spectrum, in dB
 */
-static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_generic(float* noiseFloorAmplitude, const float* realDataPoints, const float spectralExclusionValue, const unsigned int num_points){
+static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a_generic(float* noiseFloorAmplitude, const float* realDataPoints, const float spectralExclusionValue, const unsigned int num_points){
   float sumMean = 0.0;
   unsigned int number;
   // find the sum (for mean), etc
@@ -164,4 +165,4 @@ static inline void volk_32f_s32f_calc_spectral_noise_floor_32f_a16_generic(float
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_calc_spectral_noise_floor_32f_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_convert_16i_a16.h b/volk/include/volk/volk_32f_s32f_convert_16i_a.h
index d6b16e336..0a2b4f0f2 100644
--- a/volk/include/volk/volk_32f_s32f_convert_16i_a16.h
+++ b/volk/include/volk/volk_32f_s32f_convert_16i_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32f_s32f_convert_16i_a16_H
-#define INCLUDED_volk_32f_s32f_convert_16i_a16_H
+#ifndef INCLUDED_volk_32f_s32f_convert_16i_a_H
+#define INCLUDED_volk_32f_s32f_convert_16i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 16 bit integer value
@@ -13,7 +14,7 @@
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_16i_a16_sse2(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_16i_a_sse2(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int eighthPoints = num_points / 8;
@@ -44,7 +45,7 @@ static inline void volk_32f_s32f_convert_16i_a16_sse2(int16_t* outputVector, con
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 16 bit integer value
@@ -53,7 +54,7 @@ static inline void volk_32f_s32f_convert_16i_a16_sse2(int16_t* outputVector, con
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_16i_a16_sse(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_16i_a_sse(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -63,7 +64,7 @@ static inline void volk_32f_s32f_convert_16i_a16_sse(int16_t* outputVector, cons
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_load_ps(inputVectorPtr);
@@ -93,7 +94,7 @@ static inline void volk_32f_s32f_convert_16i_a16_sse(int16_t* outputVector, cons
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_16i_a16_generic(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_16i_a_generic(int16_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   int16_t* outputVectorPtr = outputVector;
   const float* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -107,4 +108,4 @@ static inline void volk_32f_s32f_convert_16i_a16_generic(int16_t* outputVector,
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_convert_16i_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_convert_16i_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_convert_16i_u.h b/volk/include/volk/volk_32f_s32f_convert_16i_u.h
index 4d306e53c..dec3f1611 100644
--- a/volk/include/volk/volk_32f_s32f_convert_16i_u.h
+++ b/volk/include/volk/volk_32f_s32f_convert_16i_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 16 bit integer value
@@ -45,7 +45,7 @@ static inline void volk_32f_s32f_convert_16i_u_sse2(int16_t* outputVector, const
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 16 bit integer value
@@ -65,7 +65,7 @@ static inline void volk_32f_s32f_convert_16i_u_sse(int16_t* outputVector, const
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_loadu_ps(inputVectorPtr);
diff --git a/volk/include/volk/volk_32f_s32f_convert_32i_a16.h b/volk/include/volk/volk_32f_s32f_convert_32i_a.h
index ae874fd7b..aa370e614 100644
--- a/volk/include/volk/volk_32f_s32f_convert_32i_a16.h
+++ b/volk/include/volk/volk_32f_s32f_convert_32i_a.h
@@ -1,10 +1,47 @@
-#ifndef INCLUDED_volk_32f_s32f_convert_32i_a16_H
-#define INCLUDED_volk_32f_s32f_convert_32i_a16_H
+#ifndef INCLUDED_volk_32f_s32f_convert_32i_a_H
+#define INCLUDED_volk_32f_s32f_convert_32i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_AVX
+#include <immintrin.h>
+  /*!
+    \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 32 bit integer value
+    \param inputVector The floating point input data buffer
+    \param outputVector The 32 bit output data buffer
+    \param scalar The value multiplied against each point in the input buffer
+    \param num_points The number of data values to be converted
+  */
+static inline void volk_32f_s32f_convert_32i_a_avx(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+  unsigned int number = 0;
+
+  const unsigned int eighthPoints = num_points / 8;
+    
+  const float* inputVectorPtr = (const float*)inputVector;
+  int32_t* outputVectorPtr = outputVector;
+  __m256 vScalar = _mm256_set1_ps(scalar);
+  __m256 inputVal1;
+  __m256i intInputVal1;
+
+  for(;number < eighthPoints; number++){
+    inputVal1 = _mm256_load_ps(inputVectorPtr); inputVectorPtr += 8;
+
+    intInputVal1 = _mm256_cvtps_epi32(_mm256_mul_ps(inputVal1, vScalar));
+
+    _mm256_store_si256((__m256i*)outputVectorPtr, intInputVal1);
+    outputVectorPtr += 8;
+  }
+
+  number = eighthPoints * 8;    
+  for(; number < num_points; number++){
+    outputVector[number] = (int32_t)(inputVector[number] * scalar);
+  }
+}
+#endif /* LV_HAVE_AVX */
+
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 32 bit integer value
@@ -13,7 +50,7 @@
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_32i_a16_sse2(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_32i_a_sse2(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -40,7 +77,7 @@ static inline void volk_32f_s32f_convert_32i_a16_sse2(int32_t* outputVector, con
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 32 bit integer value
@@ -49,7 +86,7 @@ static inline void volk_32f_s32f_convert_32i_a16_sse2(int32_t* outputVector, con
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_32i_a16_sse(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_32i_a_sse(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -59,7 +96,7 @@ static inline void volk_32f_s32f_convert_32i_a16_sse(int32_t* outputVector, cons
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_load_ps(inputVectorPtr);
@@ -89,7 +126,7 @@ static inline void volk_32f_s32f_convert_32i_a16_sse(int32_t* outputVector, cons
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_32i_a16_generic(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_32i_a_generic(int32_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   int32_t* outputVectorPtr = outputVector;
   const float* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -103,4 +140,4 @@ static inline void volk_32f_s32f_convert_32i_a16_generic(int32_t* outputVector,
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_convert_32i_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_convert_32i_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_convert_32i_u.h b/volk/include/volk/volk_32f_s32f_convert_32i_u.h
index 561fcd800..b4e954dc4 100644
--- a/volk/include/volk/volk_32f_s32f_convert_32i_u.h
+++ b/volk/include/volk/volk_32f_s32f_convert_32i_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 32 bit integer value
@@ -41,7 +41,7 @@ static inline void volk_32f_s32f_convert_32i_u_sse2(int32_t* outputVector, const
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 32 bit integer value
@@ -61,7 +61,7 @@ static inline void volk_32f_s32f_convert_32i_u_sse(int32_t* outputVector, const
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_loadu_ps(inputVectorPtr);
diff --git a/volk/include/volk/volk_32f_s32f_convert_8i_a16.h b/volk/include/volk/volk_32f_s32f_convert_8i_a.h
index f64f2a213..8d87a07d7 100644
--- a/volk/include/volk/volk_32f_s32f_convert_8i_a16.h
+++ b/volk/include/volk/volk_32f_s32f_convert_8i_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32f_s32f_convert_8i_a16_H
-#define INCLUDED_volk_32f_s32f_convert_8i_a16_H
+#ifndef INCLUDED_volk_32f_s32f_convert_8i_a_H
+#define INCLUDED_volk_32f_s32f_convert_8i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 8 bit integer value
@@ -13,7 +14,7 @@
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_8i_a16_sse2(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_8i_a_sse2(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int sixteenthPoints = num_points / 16;
@@ -51,7 +52,7 @@ static inline void volk_32f_s32f_convert_8i_a16_sse2(int8_t* outputVector, const
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 8 bit integer value
@@ -60,7 +61,7 @@ static inline void volk_32f_s32f_convert_8i_a16_sse2(int8_t* outputVector, const
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_8i_a16_sse(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_8i_a_sse(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -70,7 +71,7 @@ static inline void volk_32f_s32f_convert_8i_a16_sse(int8_t* outputVector, const
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_load_ps(inputVectorPtr);
@@ -100,7 +101,7 @@ static inline void volk_32f_s32f_convert_8i_a16_sse(int8_t* outputVector, const
     \param scalar The value multiplied against each point in the input buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32f_s32f_convert_8i_a16_generic(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_convert_8i_a_generic(int8_t* outputVector, const float* inputVector, const float scalar, unsigned int num_points){
   int8_t* outputVectorPtr = outputVector;
   const float* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -114,4 +115,4 @@ static inline void volk_32f_s32f_convert_8i_a16_generic(int8_t* outputVector, co
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_convert_8i_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_convert_8i_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_convert_8i_u.h b/volk/include/volk/volk_32f_s32f_convert_8i_u.h
index 420693571..1c6bf87c9 100644
--- a/volk/include/volk/volk_32f_s32f_convert_8i_u.h
+++ b/volk/include/volk/volk_32f_s32f_convert_8i_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 8 bit integer value
@@ -52,7 +52,7 @@ static inline void volk_32f_s32f_convert_8i_u_sse2(int8_t* outputVector, const f
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies each point in the input buffer by the scalar value, then converts the result into a 8 bit integer value
@@ -72,7 +72,7 @@ static inline void volk_32f_s32f_convert_8i_u_sse(int8_t* outputVector, const fl
   __m128 vScalar = _mm_set_ps1(scalar);
   __m128 ret;
 
-  float outputFloatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float outputFloatBuffer[4];
 
   for(;number < quarterPoints; number++){
     ret = _mm_loadu_ps(inputVectorPtr);
diff --git a/volk/include/volk/volk_32f_s32f_normalize_a16.h b/volk/include/volk/volk_32f_s32f_normalize_a.h
index 0850cddf7..f5fd0d1db 100644
--- a/volk/include/volk/volk_32f_s32f_normalize_a16.h
+++ b/volk/include/volk/volk_32f_s32f_normalize_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_s32f_normalize_a16_H
-#define INCLUDED_volk_32f_s32f_normalize_a16_H
+#ifndef INCLUDED_volk_32f_s32f_normalize_a_H
+#define INCLUDED_volk_32f_s32f_normalize_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Normalizes all points in the buffer by the scalar value ( divides each data point by the scalar value )
@@ -12,7 +12,7 @@
   \param num_points The number of values in vecBuffer
   \param scalar The scale value to be applied to each buffer value
 */
-static inline void volk_32f_s32f_normalize_a16_sse(float* vecBuffer, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_normalize_a_sse(float* vecBuffer, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   float* inputPtr = vecBuffer;
 
@@ -41,7 +41,7 @@ static inline void volk_32f_s32f_normalize_a16_sse(float* vecBuffer, const float
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Normalizes the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -49,7 +49,7 @@ static inline void volk_32f_s32f_normalize_a16_sse(float* vecBuffer, const float
   \param bVector One of the vectors to be normalizeed
   \param num_points The number of values in aVector and bVector to be normalizeed together and stored into cVector
 */
-static inline void volk_32f_s32f_normalize_a16_generic(float* vecBuffer, const float scalar, unsigned int num_points){
+static inline void volk_32f_s32f_normalize_a_generic(float* vecBuffer, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   float* inputPtr = vecBuffer;
   const float invScalar = 1.0 / scalar;
@@ -60,7 +60,7 @@ static inline void volk_32f_s32f_normalize_a16_generic(float* vecBuffer, const f
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Normalizes the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -68,14 +68,14 @@ static inline void volk_32f_s32f_normalize_a16_generic(float* vecBuffer, const f
   \param bVector One of the vectors to be normalizeed
   \param num_points The number of values in aVector and bVector to be normalizeed together and stored into cVector
 */
-extern void volk_32f_s32f_normalize_a16_orc_impl(float* dst, float* src, const float scalar, unsigned int num_points);
-static inline void volk_32f_s32f_normalize_a16_orc(float* vecBuffer, const float scalar, unsigned int num_points){
+extern void volk_32f_s32f_normalize_a_orc_impl(float* dst, float* src, const float scalar, unsigned int num_points);
+static inline void volk_32f_s32f_normalize_a_orc(float* vecBuffer, const float scalar, unsigned int num_points){
     float invscalar = 1.0 / scalar;
-    volk_32f_s32f_normalize_a16_orc_impl(vecBuffer, vecBuffer, invscalar, num_points);
+    volk_32f_s32f_normalize_a_orc_impl(vecBuffer, vecBuffer, invscalar, num_points);
 }
 #endif /* LV_HAVE_GENERIC */
 
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_normalize_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_normalize_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_power_32f_a16.h b/volk/include/volk/volk_32f_s32f_power_32f_a.h
index 3ed594d9a..c4fa31bd1 100644
--- a/volk/include/volk/volk_32f_s32f_power_32f_a16.h
+++ b/volk/include/volk/volk_32f_s32f_power_32f_a.h
@@ -1,14 +1,14 @@
-#ifndef INCLUDED_volk_32f_s32f_power_32f_a16_H
-#define INCLUDED_volk_32f_s32f_power_32f_a16_H
+#ifndef INCLUDED_volk_32f_s32f_power_32f_a_H
+#define INCLUDED_volk_32f_s32f_power_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <tmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -19,14 +19,14 @@
   \param power The power value to be applied to each data point
   \param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
 */
-static inline void volk_32f_s32f_power_32f_a16_sse4_1(float* cVector, const float* aVector, const float power, unsigned int num_points){
+static inline void volk_32f_s32f_power_32f_a_sse4_1(float* cVector, const float* aVector, const float power, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
   
   float* cPtr = cVector;
   const float* aPtr = aVector;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 vPower = _mm_set_ps1(power);
   __m128 zeroValue = _mm_setzero_ps();
   __m128 signMask;
@@ -62,10 +62,10 @@ static inline void volk_32f_s32f_power_32f_a16_sse4_1(float* cVector, const floa
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -76,14 +76,14 @@ static inline void volk_32f_s32f_power_32f_a16_sse4_1(float* cVector, const floa
   \param power The power value to be applied to each data point
   \param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
 */
-static inline void volk_32f_s32f_power_32f_a16_sse(float* cVector, const float* aVector, const float power, unsigned int num_points){
+static inline void volk_32f_s32f_power_32f_a_sse(float* cVector, const float* aVector, const float power, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
   
   float* cPtr = cVector;
   const float* aPtr = aVector;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 vPower = _mm_set_ps1(power);
   __m128 zeroValue = _mm_setzero_ps();
   __m128 signMask;
@@ -119,7 +119,7 @@ static inline void volk_32f_s32f_power_32f_a16_sse(float* cVector, const float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Takes each the input vector value to the specified power and stores the results in the return vector
     \param cVector The vector where the results will be stored
@@ -127,7 +127,7 @@ static inline void volk_32f_s32f_power_32f_a16_sse(float* cVector, const float*
     \param power The power value to be applied to each data point
     \param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
   */
-static inline void volk_32f_s32f_power_32f_a16_generic(float* cVector, const float* aVector, const float power, unsigned int num_points){
+static inline void volk_32f_s32f_power_32f_a_generic(float* cVector, const float* aVector, const float power, unsigned int num_points){
   float* cPtr = cVector;
   const float* aPtr = aVector;
   unsigned int number = 0;
@@ -141,4 +141,4 @@ static inline void volk_32f_s32f_power_32f_a16_generic(float* cVector, const flo
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_power_32f_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_power_32f_a_H */
diff --git a/volk/include/volk/volk_32f_s32f_stddev_32f_a16.h b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h
index 32f4fa067..881067bdc 100644
--- a/volk/include/volk/volk_32f_s32f_stddev_32f_a16.h
+++ b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h
@@ -1,11 +1,12 @@
-#ifndef INCLUDED_volk_32f_s32f_stddev_32f_a16_H
-#define INCLUDED_volk_32f_s32f_stddev_32f_a16_H
+#ifndef INCLUDED_volk_32f_s32f_stddev_32f_a_H
+#define INCLUDED_volk_32f_s32f_stddev_32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Calculates the standard deviation of the input buffer using the supplied mean
@@ -14,7 +15,7 @@
   \param mean The mean of the input buffer
   \param num_points The number of values in input buffer to used in the stddev calculation
 */
-static inline void volk_32f_s32f_stddev_32f_a16_sse4_1(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
+static inline void volk_32f_s32f_stddev_32f_a_sse4_1(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
   float returnValue = 0;
   if(num_points > 0){
     unsigned int number = 0;
@@ -22,7 +23,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse4_1(float* stddev, const floa
 
     const float* aPtr = inputBuffer;
 
-    float squareBuffer[4] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float squareBuffer[4];
 
     __m128 squareAccumulator = _mm_setzero_ps();
     __m128 aVal1, aVal2, aVal3, aVal4;
@@ -65,7 +66,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse4_1(float* stddev, const floa
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the standard deviation of the input buffer using the supplied mean
@@ -74,7 +75,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse4_1(float* stddev, const floa
   \param mean The mean of the input buffer
   \param num_points The number of values in input buffer to used in the stddev calculation
 */
-static inline void volk_32f_s32f_stddev_32f_a16_sse(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
+static inline void volk_32f_s32f_stddev_32f_a_sse(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
   float returnValue = 0;
   if(num_points > 0){
     unsigned int number = 0;
@@ -82,7 +83,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse(float* stddev, const float*
 
     const float* aPtr = inputBuffer;
 
-    float squareBuffer[4] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float squareBuffer[4];
 
     __m128 squareAccumulator = _mm_setzero_ps();
     __m128 aVal = _mm_setzero_ps();
@@ -111,7 +112,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse(float* stddev, const float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the standard deviation of the input buffer using the supplied mean
   \param stddev The calculated standard deviation
@@ -119,7 +120,7 @@ static inline void volk_32f_s32f_stddev_32f_a16_sse(float* stddev, const float*
   \param mean The mean of the input buffer
   \param num_points The number of values in input buffer to used in the stddev calculation
 */
-static inline void volk_32f_s32f_stddev_32f_a16_generic(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
+static inline void volk_32f_s32f_stddev_32f_a_generic(float* stddev, const float* inputBuffer, const float mean, unsigned int num_points){
   float returnValue = 0;
   if(num_points > 0){
     const float* aPtr = inputBuffer;
@@ -141,4 +142,4 @@ static inline void volk_32f_s32f_stddev_32f_a16_generic(float* stddev, const flo
 
 
 
-#endif /* INCLUDED_volk_32f_s32f_stddev_32f_a16_H */
+#endif /* INCLUDED_volk_32f_s32f_stddev_32f_a_H */
diff --git a/volk/include/volk/volk_32f_sqrt_32f_a16.h b/volk/include/volk/volk_32f_sqrt_32f_a.h
index 513c2cffe..e44c73cfd 100644
--- a/volk/include/volk/volk_32f_sqrt_32f_a16.h
+++ b/volk/include/volk/volk_32f_sqrt_32f_a.h
@@ -1,11 +1,11 @@
-#ifndef INCLUDED_volk_32f_sqrt_32f_a16_H
-#define INCLUDED_volk_32f_sqrt_32f_a16_H
+#ifndef INCLUDED_volk_32f_sqrt_32f_a_H
+#define INCLUDED_volk_32f_sqrt_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Sqrts the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param aVector One of the vectors to be sqrted
   \param num_points The number of values in aVector and bVector to be sqrted together and stored into cVector
 */
-static inline void volk_32f_sqrt_32f_a16_sse(float* cVector, const float* aVector, unsigned int num_points){
+static inline void volk_32f_sqrt_32f_a_sse(float* cVector, const float* aVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -40,14 +40,14 @@ static inline void volk_32f_sqrt_32f_a16_sse(float* cVector, const float* aVecto
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Sqrts the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
   \param aVector One of the vectors to be sqrted
   \param num_points The number of values in aVector and bVector to be sqrted together and stored into cVector
 */
-static inline void volk_32f_sqrt_32f_a16_generic(float* cVector, const float* aVector, unsigned int num_points){
+static inline void volk_32f_sqrt_32f_a_generic(float* cVector, const float* aVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     unsigned int number = 0;
@@ -58,20 +58,20 @@ static inline void volk_32f_sqrt_32f_a16_generic(float* cVector, const float* aV
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
-extern void volk_32f_sqrt_32f_a16_orc_impl(float *, const float*, unsigned int);
+#ifdef LV_HAVE_ORC
+extern void volk_32f_sqrt_32f_a_orc_impl(float *, const float*, unsigned int);
 /*!
   \brief Sqrts the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
   \param aVector One of the vectors to be sqrted
   \param num_points The number of values in aVector and bVector to be sqrted together and stored into cVector
 */
-static inline void volk_32f_sqrt_32f_a16_orc(float* cVector, const float* aVector, unsigned int num_points){
-    volk_32f_sqrt_32f_a16_orc_impl(cVector, aVector, num_points);
+static inline void volk_32f_sqrt_32f_a_orc(float* cVector, const float* aVector, unsigned int num_points){
+    volk_32f_sqrt_32f_a_orc_impl(cVector, aVector, num_points);
 }
 
 #endif /* LV_HAVE_ORC */
 
 
 
-#endif /* INCLUDED_volk_32f_sqrt_32f_a16_H */
+#endif /* INCLUDED_volk_32f_sqrt_32f_a_H */
diff --git a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a16.h b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h
index 278089841..3a82e3d2f 100644
--- a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a16.h
+++ b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h
@@ -1,11 +1,12 @@
-#ifndef INCLUDED_volk_32f_stddev_and_mean_32f_x2_a16_H
-#define INCLUDED_volk_32f_stddev_and_mean_32f_x2_a16_H
+#ifndef INCLUDED_volk_32f_stddev_and_mean_32f_x2_a_H
+#define INCLUDED_volk_32f_stddev_and_mean_32f_x2_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Calculates the standard deviation and mean of the input buffer
@@ -14,7 +15,7 @@
   \param inputBuffer The buffer of points to calculate the std deviation for
   \param num_points The number of values in input buffer to used in the stddev and mean calculations
 */
-static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse4_1(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
+static inline void volk_32f_stddev_and_mean_32f_x2_a_sse4_1(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
   float returnValue = 0;
   float newMean = 0;
   if(num_points > 0){
@@ -22,8 +23,8 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse4_1(float* stddev, flo
     const unsigned int sixteenthPoints = num_points / 16;
 
     const float* aPtr = inputBuffer;
-    float meanBuffer[4] __attribute__((aligned(128)));
-    float squareBuffer[4] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float meanBuffer[4];
+    __VOLK_ATTR_ALIGNED(16) float squareBuffer[4];
 
     __m128 accumulator = _mm_setzero_ps();
     __m128 squareAccumulator = _mm_setzero_ps();
@@ -78,7 +79,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse4_1(float* stddev, flo
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the standard deviation and mean of the input buffer
@@ -87,7 +88,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse4_1(float* stddev, flo
   \param inputBuffer The buffer of points to calculate the std deviation for
   \param num_points The number of values in input buffer to used in the stddev and mean calculations
 */
-static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
+static inline void volk_32f_stddev_and_mean_32f_x2_a_sse(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
   float returnValue = 0;
   float newMean = 0;
   if(num_points > 0){
@@ -95,8 +96,8 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse(float* stddev, float*
     const unsigned int quarterPoints = num_points / 4;
 
     const float* aPtr = inputBuffer;
-    float meanBuffer[4] __attribute__((aligned(128)));
-    float squareBuffer[4] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float meanBuffer[4];
+    __VOLK_ATTR_ALIGNED(16) float squareBuffer[4];
 
     __m128 accumulator = _mm_setzero_ps();
     __m128 squareAccumulator = _mm_setzero_ps();
@@ -134,7 +135,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse(float* stddev, float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the standard deviation and mean of the input buffer
   \param stddev The calculated standard deviation
@@ -142,7 +143,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_sse(float* stddev, float*
   \param inputBuffer The buffer of points to calculate the std deviation for
   \param num_points The number of values in input buffer to used in the stddev and mean calculations
 */
-static inline void volk_32f_stddev_and_mean_32f_x2_a16_generic(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
+static inline void volk_32f_stddev_and_mean_32f_x2_a_generic(float* stddev, float* mean, const float* inputBuffer, unsigned int num_points){
   float returnValue = 0;
   float newMean = 0;
   if(num_points > 0){
@@ -166,4 +167,4 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a16_generic(float* stddev, fl
 
 
 
-#endif /* INCLUDED_volk_32f_stddev_and_mean_32f_x2_a16_H */
+#endif /* INCLUDED_volk_32f_stddev_and_mean_32f_x2_a_H */
diff --git a/volk/include/volk/volk_32f_x2_add_32f_a16.h b/volk/include/volk/volk_32f_x2_add_32f_a.h
index d0d0e0a0e..3bc83653b 100644
--- a/volk/include/volk/volk_32f_x2_add_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_add_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_add_32f_a16_H
-#define INCLUDED_volk_32f_x2_add_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_add_32f_a_H
+#define INCLUDED_volk_32f_x2_add_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Adds the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param bVector One of the vectors to be added
   \param num_points The number of values in aVector and bVector to be added together and stored into cVector
 */
-static inline void volk_32f_x2_add_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_add_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,7 @@ static inline void volk_32f_x2_add_32f_a16_sse(float* cVector, const float* aVec
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Adds the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -51,7 +51,7 @@ static inline void volk_32f_x2_add_32f_a16_sse(float* cVector, const float* aVec
   \param bVector One of the vectors to be added
   \param num_points The number of values in aVector and bVector to be added together and stored into cVector
 */
-static inline void volk_32f_x2_add_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_add_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -63,7 +63,7 @@ static inline void volk_32f_x2_add_32f_a16_generic(float* cVector, const float*
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Adds the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -71,11 +71,11 @@ static inline void volk_32f_x2_add_32f_a16_generic(float* cVector, const float*
   \param bVector One of the vectors to be added
   \param num_points The number of values in aVector and bVector to be added together and stored into cVector
 */
-extern void volk_32f_x2_add_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_add_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_add_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_add_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_add_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_add_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32f_x2_add_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_add_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x2_divide_32f_a16.h b/volk/include/volk/volk_32f_x2_divide_32f_a.h
index d844e25b0..52ddfae87 100644
--- a/volk/include/volk/volk_32f_x2_divide_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_divide_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_divide_32f_a16_H
-#define INCLUDED_volk_32f_x2_divide_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_divide_32f_a_H
+#define INCLUDED_volk_32f_x2_divide_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Divides the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param bVector The divisor vector
   \param num_points The number of values in aVector and bVector to be divideed together and stored into cVector
 */
-static inline void volk_32f_x2_divide_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_divide_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,7 @@ static inline void volk_32f_x2_divide_32f_a16_sse(float* cVector, const float* a
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Divides the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -51,7 +51,7 @@ static inline void volk_32f_x2_divide_32f_a16_sse(float* cVector, const float* a
   \param bVector The divisor vector
   \param num_points The number of values in aVector and bVector to be divideed together and stored into cVector
 */
-static inline void volk_32f_x2_divide_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_divide_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -63,7 +63,7 @@ static inline void volk_32f_x2_divide_32f_a16_generic(float* cVector, const floa
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Divides the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -71,12 +71,12 @@ static inline void volk_32f_x2_divide_32f_a16_generic(float* cVector, const floa
   \param bVector The divisor vector
   \param num_points The number of values in aVector and bVector to be divideed together and stored into cVector
 */
-extern void volk_32f_x2_divide_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_divide_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_divide_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_divide_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_divide_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_divide_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
 
-#endif /* INCLUDED_volk_32f_x2_divide_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_divide_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x2_dot_prod_32f_a16.h b/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h
index 61aa56815..0c58f2ecf 100644
--- a/volk/include/volk/volk_32f_x2_dot_prod_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_dot_prod_32f_a.h
@@ -1,13 +1,14 @@
-#ifndef INCLUDED_volk_32f_x2_dot_prod_32f_a16_H
-#define INCLUDED_volk_32f_x2_dot_prod_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_dot_prod_32f_a_H
+#define INCLUDED_volk_32f_x2_dot_prod_32f_a_H
 
+#include <volk/volk_common.h>
 #include<stdio.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
 
-static inline void volk_32f_x2_dot_prod_32f_a16_generic(float * result, const float * input, const float * taps, unsigned int num_points) {
+static inline void volk_32f_x2_dot_prod_32f_a_generic(float * result, const float * input, const float * taps, unsigned int num_points) {
 
   float dotProduct = 0;
   const float* aPtr = input;
@@ -24,10 +25,10 @@ static inline void volk_32f_x2_dot_prod_32f_a16_generic(float * result, const fl
 #endif /*LV_HAVE_GENERIC*/
 
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 
 
-static inline void volk_32f_x2_dot_prod_32f_a16_sse( float* result, const  float* input, const  float* taps, unsigned int num_points) {
+static inline void volk_32f_x2_dot_prod_32f_a_sse( float* result, const  float* input, const  float* taps, unsigned int num_points) {
   
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
@@ -53,7 +54,7 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse( float* result, const  float
     bPtr += 4;
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
 
   _mm_store_ps(dotProductVector,dotProdVal); // Store the results back into the dot product vector
 
@@ -73,11 +74,11 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse( float* result, const  float
 
 #endif /*LV_HAVE_SSE*/  
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 
 #include <pmmintrin.h>
 
-static inline void volk_32f_x2_dot_prod_32f_a16_sse3(float * result, const float * input, const float * taps, unsigned int num_points) {
+static inline void volk_32f_x2_dot_prod_32f_a_sse3(float * result, const float * input, const float * taps, unsigned int num_points) {
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -102,7 +103,7 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse3(float * result, const float
     bPtr += 4;
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
   dotProdVal = _mm_hadd_ps(dotProdVal, dotProdVal);
 
   _mm_store_ps(dotProductVector,dotProdVal); // Store the results back into the dot product vector
@@ -120,11 +121,11 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse3(float * result, const float
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 
 #include <smmintrin.h>
 
-static inline void volk_32f_x2_dot_prod_32f_a16_sse4_1(float * result, const float * input, const float* taps, unsigned int num_points) {
+static inline void volk_32f_x2_dot_prod_32f_a_sse4_1(float * result, const float * input, const float* taps, unsigned int num_points) {
   unsigned int number = 0;
   const unsigned int sixteenthPoints = num_points / 16;
 
@@ -163,7 +164,7 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse4_1(float * result, const flo
     dotProdVal = _mm_add_ps(dotProdVal, cVal1);
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
   _mm_store_ps(dotProductVector, dotProdVal); // Store the results back into the dot product vector
 
   dotProduct = dotProductVector[0];
@@ -181,4 +182,4 @@ static inline void volk_32f_x2_dot_prod_32f_a16_sse4_1(float * result, const flo
 
 #endif /*LV_HAVE_SSE4_1*/
 
-#endif /*INCLUDED_volk_32f_x2_dot_prod_32f_a16_H*/
+#endif /*INCLUDED_volk_32f_x2_dot_prod_32f_a_H*/
diff --git a/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h b/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
index 8469a3cea..7f47122ff 100644
--- a/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
+++ b/volk/include/volk/volk_32f_x2_dot_prod_32f_u.h
@@ -4,7 +4,7 @@
 #include<stdio.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
 
 static inline void volk_32f_x2_dot_prod_32f_u_generic(float * result, const float * input, const float * taps, unsigned int num_points) {
@@ -24,7 +24,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_generic(float * result, const floa
 #endif /*LV_HAVE_GENERIC*/
 
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 
 
 static inline void volk_32f_x2_dot_prod_32f_u_sse( float* result, const  float* input, const  float* taps, unsigned int num_points) {
@@ -53,7 +53,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse( float* result, const  float*
     bPtr += 4;
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
 
   _mm_store_ps(dotProductVector,dotProdVal); // Store the results back into the dot product vector
 
@@ -73,7 +73,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse( float* result, const  float*
 
 #endif /*LV_HAVE_SSE*/  
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 
 #include <pmmintrin.h>
 
@@ -102,7 +102,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse3(float * result, const float *
     bPtr += 4;
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
   dotProdVal = _mm_hadd_ps(dotProdVal, dotProdVal);
 
   _mm_store_ps(dotProductVector,dotProdVal); // Store the results back into the dot product vector
@@ -120,7 +120,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse3(float * result, const float *
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 
 #include <smmintrin.h>
 
@@ -163,7 +163,7 @@ static inline void volk_32f_x2_dot_prod_32f_u_sse4_1(float * result, const float
     dotProdVal = _mm_add_ps(dotProdVal, cVal1);
   }
 
-  float dotProductVector[4] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) float dotProductVector[4];
   _mm_store_ps(dotProductVector, dotProdVal); // Store the results back into the dot product vector
 
   dotProduct = dotProductVector[0];
diff --git a/volk/include/volk/volk_32f_x2_interleave_32fc_a16.h b/volk/include/volk/volk_32f_x2_interleave_32fc_a.h
index 29c9392df..1d4d2dbbd 100644
--- a/volk/include/volk/volk_32f_x2_interleave_32fc_a16.h
+++ b/volk/include/volk/volk_32f_x2_interleave_32fc_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_interleave_32fc_a16_H
-#define INCLUDED_volk_32f_x2_interleave_32fc_a16_H
+#ifndef INCLUDED_volk_32f_x2_interleave_32fc_a_H
+#define INCLUDED_volk_32f_x2_interleave_32fc_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Interleaves the I & Q vector data into the complex vector
@@ -13,7 +13,7 @@
   \param complexVector The complex output vector
   \param num_points The number of complex data values to be interleaved
 */
-static inline void volk_32f_x2_interleave_32fc_a16_sse(lv_32fc_t* complexVector, const float* iBuffer, const float* qBuffer, unsigned int num_points){
+static inline void volk_32f_x2_interleave_32fc_a_sse(lv_32fc_t* complexVector, const float* iBuffer, const float* qBuffer, unsigned int num_points){
   unsigned int number = 0;
   float* complexVectorPtr = (float*)complexVector;
   const float* iBufferPtr = iBuffer;
@@ -48,7 +48,7 @@ static inline void volk_32f_x2_interleave_32fc_a16_sse(lv_32fc_t* complexVector,
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Interleaves the I & Q vector data into the complex vector.
   \param iBuffer The I buffer data to be interleaved
@@ -56,7 +56,7 @@ static inline void volk_32f_x2_interleave_32fc_a16_sse(lv_32fc_t* complexVector,
   \param complexVector The complex output vector
   \param num_points The number of complex data values to be interleaved
 */
-static inline void volk_32f_x2_interleave_32fc_a16_generic(lv_32fc_t* complexVector, const float* iBuffer, const float* qBuffer, unsigned int num_points){
+static inline void volk_32f_x2_interleave_32fc_a_generic(lv_32fc_t* complexVector, const float* iBuffer, const float* qBuffer, unsigned int num_points){
   float* complexVectorPtr = (float*)complexVector;
   const float* iBufferPtr = iBuffer;
   const float* qBufferPtr = qBuffer;
@@ -72,4 +72,4 @@ static inline void volk_32f_x2_interleave_32fc_a16_generic(lv_32fc_t* complexVec
 
 
 
-#endif /* INCLUDED_volk_32f_x2_interleave_32fc_a16_H */
+#endif /* INCLUDED_volk_32f_x2_interleave_32fc_a_H */
diff --git a/volk/include/volk/volk_32f_x2_max_32f_a16.h b/volk/include/volk/volk_32f_x2_max_32f_a.h
index 26e7f1246..7948c458d 100644
--- a/volk/include/volk/volk_32f_x2_max_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_max_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_max_32f_a16_H
-#define INCLUDED_volk_32f_x2_max_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_max_32f_a_H
+#define INCLUDED_volk_32f_x2_max_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Selects maximum value from each entry between bVector and aVector and store their results in the cVector
@@ -13,7 +13,7 @@
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_32f_x2_max_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_max_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -45,7 +45,7 @@ static inline void volk_32f_x2_max_32f_a16_sse(float* cVector, const float* aVec
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Selects maximum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -53,7 +53,7 @@ static inline void volk_32f_x2_max_32f_a16_sse(float* cVector, const float* aVec
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_32f_x2_max_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_max_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -67,7 +67,7 @@ static inline void volk_32f_x2_max_32f_a16_generic(float* cVector, const float*
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Selects maximum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -75,11 +75,11 @@ static inline void volk_32f_x2_max_32f_a16_generic(float* cVector, const float*
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-extern void volk_32f_x2_max_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_max_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_max_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_max_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_max_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_max_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32f_x2_max_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_max_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x2_min_32f_a16.h b/volk/include/volk/volk_32f_x2_min_32f_a.h
index 23bae044c..d77134868 100644
--- a/volk/include/volk/volk_32f_x2_min_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_min_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_min_32f_a16_H
-#define INCLUDED_volk_32f_x2_min_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_min_32f_a_H
+#define INCLUDED_volk_32f_x2_min_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Selects minimum value from each entry between bVector and aVector and store their results in the cVector
@@ -13,7 +13,7 @@
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_32f_x2_min_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_min_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -45,7 +45,7 @@ static inline void volk_32f_x2_min_32f_a16_sse(float* cVector, const float* aVec
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Selects minimum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -53,7 +53,7 @@ static inline void volk_32f_x2_min_32f_a16_sse(float* cVector, const float* aVec
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_32f_x2_min_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_min_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -67,7 +67,7 @@ static inline void volk_32f_x2_min_32f_a16_generic(float* cVector, const float*
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Selects minimum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -75,11 +75,11 @@ static inline void volk_32f_x2_min_32f_a16_generic(float* cVector, const float*
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-extern void volk_32f_x2_min_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_min_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_min_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_min_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_min_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_min_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32f_x2_min_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_min_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x2_multiply_32f_a16.h b/volk/include/volk/volk_32f_x2_multiply_32f_a.h
index a0dcfa86e..fae9a652f 100644
--- a/volk/include/volk/volk_32f_x2_multiply_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_multiply_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_multiply_32f_a16_H
-#define INCLUDED_volk_32f_x2_multiply_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_multiply_32f_a_H
+#define INCLUDED_volk_32f_x2_multiply_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Multiplys the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param bVector One of the vectors to be multiplied
   \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_32f_x2_multiply_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_multiply_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,46 @@ static inline void volk_32f_x2_multiply_32f_a16_sse(float* cVector, const float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_AVX
+#include <immintrin.h>
+/*!
+  \brief Multiplies the two input vectors and store their results in the third vector
+  \param cVector The vector where the results will be stored
+  \param aVector One of the vectors to be multiplied
+  \param bVector One of the vectors to be multiplied
+  \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
+*/
+static inline void volk_32f_x2_multiply_32f_a_avx(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    unsigned int number = 0;
+    const unsigned int eighthPoints = num_points / 8;
+
+    float* cPtr = cVector;
+    const float* aPtr = aVector;
+    const float* bPtr=  bVector;
+
+    __m256 aVal, bVal, cVal;
+    for(;number < eighthPoints; number++){
+      
+      aVal = _mm256_load_ps(aPtr); 
+      bVal = _mm256_load_ps(bPtr);
+      
+      cVal = _mm256_mul_ps(aVal, bVal); 
+      
+      _mm256_store_ps(cPtr,cVal); // Store the results back into the C container
+
+      aPtr += 8;
+      bPtr += 8;
+      cPtr += 8;
+    }
+
+    number = eighthPoints * 8;
+    for(;number < num_points; number++){
+      *cPtr++ = (*aPtr++) * (*bPtr++);
+    }
+}
+#endif /* LV_HAVE_AVX */
+
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Multiplys the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -51,7 +90,7 @@ static inline void volk_32f_x2_multiply_32f_a16_sse(float* cVector, const float*
   \param bVector One of the vectors to be multiplied
   \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_32f_x2_multiply_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_multiply_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -63,7 +102,7 @@ static inline void volk_32f_x2_multiply_32f_a16_generic(float* cVector, const fl
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Multiplys the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -71,11 +110,11 @@ static inline void volk_32f_x2_multiply_32f_a16_generic(float* cVector, const fl
   \param bVector One of the vectors to be multiplied
   \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
 */
-extern void volk_32f_x2_multiply_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_multiply_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_multiply_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_multiply_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_multiply_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_multiply_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32f_x2_multiply_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_multiply_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x2_s32f_interleave_16ic_a16.h b/volk/include/volk/volk_32f_x2_s32f_interleave_16ic_a.h
index 30306774d..cc02c3678 100644
--- a/volk/include/volk/volk_32f_x2_s32f_interleave_16ic_a16.h
+++ b/volk/include/volk/volk_32f_x2_s32f_interleave_16ic_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32f_x2_s32f_interleave_16ic_a16_H
-#define INCLUDED_volk_32f_x2_s32f_interleave_16ic_a16_H
+#ifndef INCLUDED_volk_32f_x2_s32f_interleave_16ic_a_H
+#define INCLUDED_volk_32f_x2_s32f_interleave_16ic_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Interleaves the I & Q vector data into the complex vector, scales the output values by the scalar, and converts to 16 bit data.
@@ -14,7 +15,7 @@
     \param scalar The scaling value being multiplied against each data point
     \param num_points The number of complex data values to be interleaved
   */
-static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse2(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
+static inline void volk_32f_x2_s32f_interleave_16ic_a_sse2(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const float* iBufferPtr = iBuffer;
     const float* qBufferPtr = qBuffer;
@@ -62,7 +63,7 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse2(lv_16sc_t* complexV
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Interleaves the I & Q vector data into the complex vector, scales the output values by the scalar, and converts to 16 bit data.
@@ -72,7 +73,7 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse2(lv_16sc_t* complexV
     \param scalar The scaling value being multiplied against each data point
     \param num_points The number of complex data values to be interleaved
   */
-static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
+static inline void volk_32f_x2_s32f_interleave_16ic_a_sse(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const float* iBufferPtr = iBuffer;
     const float* qBufferPtr = qBuffer;
@@ -85,7 +86,7 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse(lv_16sc_t* complexVe
 
     int16_t* complexVectorPtr = (int16_t*)complexVector;
 
-    float floatBuffer[4] __attribute__((aligned(128)));
+    __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
     for(;number < quarterPoints; number++){
       iValue = _mm_load_ps(iBufferPtr);
@@ -127,7 +128,7 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse(lv_16sc_t* complexVe
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Interleaves the I & Q vector data into the complex vector, scales the output values by the scalar, and converts to 16 bit data.
     \param iBuffer The I buffer data to be interleaved
@@ -136,7 +137,7 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_sse(lv_16sc_t* complexVe
     \param scalar The scaling value being multiplied against each data point
     \param num_points The number of complex data values to be interleaved
   */
-static inline void volk_32f_x2_s32f_interleave_16ic_a16_generic(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
+static inline void volk_32f_x2_s32f_interleave_16ic_a_generic(lv_16sc_t* complexVector, const float* iBuffer, const float* qBuffer, const float scalar, unsigned int num_points){
   int16_t* complexVectorPtr = (int16_t*)complexVector;
   const float* iBufferPtr = iBuffer;
   const float* qBufferPtr = qBuffer;
@@ -152,4 +153,4 @@ static inline void volk_32f_x2_s32f_interleave_16ic_a16_generic(lv_16sc_t* compl
 
 
 
-#endif /* INCLUDED_volk_32f_x2_s32f_interleave_16ic_a16_H */
+#endif /* INCLUDED_volk_32f_x2_s32f_interleave_16ic_a_H */
diff --git a/volk/include/volk/volk_32f_x2_subtract_32f_a16.h b/volk/include/volk/volk_32f_x2_subtract_32f_a.h
index 7404bfe79..16cad008a 100644
--- a/volk/include/volk/volk_32f_x2_subtract_32f_a16.h
+++ b/volk/include/volk/volk_32f_x2_subtract_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32f_x2_subtract_32f_a16_H
-#define INCLUDED_volk_32f_x2_subtract_32f_a16_H
+#ifndef INCLUDED_volk_32f_x2_subtract_32f_a_H
+#define INCLUDED_volk_32f_x2_subtract_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Subtracts bVector form aVector and store their results in the cVector
@@ -13,7 +13,7 @@
   \param bVector The vector to be subtracted
   \param num_points The number of values in aVector and bVector to be subtracted together and stored into cVector
 */
-static inline void volk_32f_x2_subtract_32f_a16_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_subtract_32f_a_sse(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,7 @@ static inline void volk_32f_x2_subtract_32f_a16_sse(float* cVector, const float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Subtracts bVector form aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -51,7 +51,7 @@ static inline void volk_32f_x2_subtract_32f_a16_sse(float* cVector, const float*
   \param bVector The vector to be subtracted
   \param num_points The number of values in aVector and bVector to be subtracted together and stored into cVector
 */
-static inline void volk_32f_x2_subtract_32f_a16_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32f_x2_subtract_32f_a_generic(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
     float* cPtr = cVector;
     const float* aPtr = aVector;
     const float* bPtr=  bVector;
@@ -63,7 +63,7 @@ static inline void volk_32f_x2_subtract_32f_a16_generic(float* cVector, const fl
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Subtracts bVector form aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -71,11 +71,11 @@ static inline void volk_32f_x2_subtract_32f_a16_generic(float* cVector, const fl
   \param bVector The vector to be subtracted
   \param num_points The number of values in aVector and bVector to be subtracted together and stored into cVector
 */
-extern void volk_32f_x2_subtract_32f_a16_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32f_x2_subtract_32f_a16_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
-    volk_32f_x2_subtract_32f_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32f_x2_subtract_32f_a_orc_impl(float* cVector, const float* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32f_x2_subtract_32f_a_orc(float* cVector, const float* aVector, const float* bVector, unsigned int num_points){
+    volk_32f_x2_subtract_32f_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32f_x2_subtract_32f_a16_H */
+#endif /* INCLUDED_volk_32f_x2_subtract_32f_a_H */
diff --git a/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a16.h b/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h
index af9e39537..2ea8fa96d 100644
--- a/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a16.h
+++ b/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h
@@ -1,5 +1,5 @@
-#ifndef INCLUDED_volk_32f_x3_sum_of_poly_32f_a16_H
-#define INCLUDED_volk_32f_x3_sum_of_poly_32f_a16_H
+#ifndef INCLUDED_volk_32f_x3_sum_of_poly_32f_a_H
+#define INCLUDED_volk_32f_x3_sum_of_poly_32f_a_H
 
 #include<inttypes.h>
 #include<stdio.h>
@@ -9,11 +9,11 @@
 #define MAX(X,Y) ((X) > (Y)?(X):(Y))
 #endif
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include<xmmintrin.h>
 #include<pmmintrin.h>
 
-static inline void volk_32f_x3_sum_of_poly_32f_a16_sse3(float* target, float* src0, float* center_point_array, float* cutoff, unsigned int num_bytes) {
+static inline void volk_32f_x3_sum_of_poly_32f_a_sse3(float* target, float* src0, float* center_point_array, float* cutoff, unsigned int num_bytes) {
   
   
   float result = 0.0;
@@ -98,9 +98,9 @@ static inline void volk_32f_x3_sum_of_poly_32f_a16_sse3(float* target, float* sr
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
-static inline void volk_32f_x3_sum_of_poly_32f_a16_generic(float* target, float* src0, float* center_point_array, float* cutoff, unsigned int num_bytes) {
+static inline void volk_32f_x3_sum_of_poly_32f_a_generic(float* target, float* src0, float* center_point_array, float* cutoff, unsigned int num_bytes) {
 
 
     
@@ -148,4 +148,4 @@ static inline void volk_32f_x3_sum_of_poly_32f_a16_generic(float* target, float*
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_32f_x3_sum_of_poly_32f_a16_H*/
+#endif /*INCLUDED_volk_32f_x3_sum_of_poly_32f_a_H*/
diff --git a/volk/include/volk/volk_32fc_32f_multiply_32fc_a16.h b/volk/include/volk/volk_32fc_32f_multiply_32fc_a.h
index 514998800..b7350b9fa 100644
--- a/volk/include/volk/volk_32fc_32f_multiply_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_32f_multiply_32fc_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32fc_32f_multiply_32fc_a16_H
-#define INCLUDED_volk_32fc_32f_multiply_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_32f_multiply_32fc_a_H
+#define INCLUDED_volk_32fc_32f_multiply_32fc_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Multiplies the input complex vector with the input float vector and store their results in the third vector
@@ -13,7 +13,7 @@
     \param bVector The vectors containing the float values to be multiplied against each complex value in aVector
     \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
   */
-static inline void volk_32fc_32f_multiply_32fc_a16_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32fc_32f_multiply_32fc_a_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -56,7 +56,7 @@ static inline void volk_32fc_32f_multiply_32fc_a16_sse(lv_32fc_t* cVector, const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Multiplies the input complex vector with the input lv_32fc_t vector and store their results in the third vector
     \param cVector The vector where the results will be stored
@@ -64,7 +64,7 @@ static inline void volk_32fc_32f_multiply_32fc_a16_sse(lv_32fc_t* cVector, const
     \param bVector The vectors containing the lv_32fc_t values to be multiplied against each complex value in aVector
     \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
   */
-static inline void volk_32fc_32f_multiply_32fc_a16_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
+static inline void volk_32fc_32f_multiply_32fc_a_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
   lv_32fc_t* cPtr = cVector;
   const lv_32fc_t* aPtr = aVector;
   const float* bPtr=  bVector;
@@ -76,7 +76,7 @@ static inline void volk_32fc_32f_multiply_32fc_a16_generic(lv_32fc_t* cVector, c
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Multiplies the input complex vector with the input lv_32fc_t vector and store their results in the third vector
     \param cVector The vector where the results will be stored
@@ -84,12 +84,12 @@ static inline void volk_32fc_32f_multiply_32fc_a16_generic(lv_32fc_t* cVector, c
     \param bVector The vectors containing the lv_32fc_t values to be multiplied against each complex value in aVector
     \param num_points The number of values in aVector and bVector to be multiplied together and stored into cVector
   */
-extern void volk_32fc_32f_multiply_32fc_a16_orc_impl(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points);
-static inline void volk_32fc_32f_multiply_32fc_a16_orc(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
-    volk_32fc_32f_multiply_32fc_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32fc_32f_multiply_32fc_a_orc_impl(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points);
+static inline void volk_32fc_32f_multiply_32fc_a_orc(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float* bVector, unsigned int num_points){
+    volk_32fc_32f_multiply_32fc_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_GENERIC */
 
 
 
-#endif /* INCLUDED_volk_32fc_32f_multiply_32fc_a16_H */
+#endif /* INCLUDED_volk_32fc_32f_multiply_32fc_a_H */
diff --git a/volk/include/volk/volk_32fc_deinterleave_32f_x2_a16.h b/volk/include/volk/volk_32fc_deinterleave_32f_x2_a.h
index 84d2576ed..9de036ef4 100644
--- a/volk/include/volk/volk_32fc_deinterleave_32f_x2_a16.h
+++ b/volk/include/volk/volk_32fc_deinterleave_32f_x2_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32fc_deinterleave_32f_x2_a16_H
-#define INCLUDED_volk_32fc_deinterleave_32f_x2_a16_H
+#ifndef INCLUDED_volk_32fc_deinterleave_32f_x2_a_H
+#define INCLUDED_volk_32fc_deinterleave_32f_x2_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex vector into I & Q vector data
@@ -13,7 +13,7 @@
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_32f_x2_a16_sse(float* iBuffer, float* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_32f_x2_a_sse(float* iBuffer, float* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
@@ -49,7 +49,7 @@ static inline void volk_32fc_deinterleave_32f_x2_a16_sse(float* iBuffer, float*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex vector into I & Q vector data
   \param complexVector The complex input vector
@@ -57,7 +57,7 @@ static inline void volk_32fc_deinterleave_32f_x2_a16_sse(float* iBuffer, float*
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_32f_x2_a16_generic(float* iBuffer, float* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_32f_x2_a_generic(float* iBuffer, float* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
@@ -72,4 +72,4 @@ static inline void volk_32fc_deinterleave_32f_x2_a16_generic(float* iBuffer, flo
 
 
 
-#endif /* INCLUDED_volk_32fc_deinterleave_32f_x2_a16_H */
+#endif /* INCLUDED_volk_32fc_deinterleave_32f_x2_a_H */
diff --git a/volk/include/volk/volk_32fc_deinterleave_64f_x2_a16.h b/volk/include/volk/volk_32fc_deinterleave_64f_x2_a.h
index 34262a7af..29c369d9a 100644
--- a/volk/include/volk/volk_32fc_deinterleave_64f_x2_a16.h
+++ b/volk/include/volk/volk_32fc_deinterleave_64f_x2_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32fc_deinterleave_64f_x2_a16_H
-#define INCLUDED_volk_32fc_deinterleave_64f_x2_a16_H
+#ifndef INCLUDED_volk_32fc_deinterleave_64f_x2_a_H
+#define INCLUDED_volk_32fc_deinterleave_64f_x2_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Deinterleaves the lv_32fc_t vector into double I & Q vector data
@@ -13,7 +13,7 @@
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_64f_x2_a16_sse2(double* iBuffer, double* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_64f_x2_a_sse2(double* iBuffer, double* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
 
     const float* complexVectorPtr = (float*)complexVector;
@@ -51,7 +51,7 @@ static inline void volk_32fc_deinterleave_64f_x2_a16_sse2(double* iBuffer, doubl
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the lv_32fc_t vector into double I & Q vector data
   \param complexVector The complex input vector
@@ -59,7 +59,7 @@ static inline void volk_32fc_deinterleave_64f_x2_a16_sse2(double* iBuffer, doubl
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_64f_x2_a16_generic(double* iBuffer, double* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_64f_x2_a_generic(double* iBuffer, double* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const float* complexVectorPtr = (float*)complexVector;
   double* iBufferPtr = iBuffer;
@@ -75,4 +75,4 @@ static inline void volk_32fc_deinterleave_64f_x2_a16_generic(double* iBuffer, do
 
 
 
-#endif /* INCLUDED_volk_32fc_deinterleave_64f_x2_a16_H */
+#endif /* INCLUDED_volk_32fc_deinterleave_64f_x2_a_H */
diff --git a/volk/include/volk/volk_32fc_deinterleave_real_32f_a16.h b/volk/include/volk/volk_32fc_deinterleave_real_32f_a.h
index 9838ec88b..a1d0fd5d1 100644
--- a/volk/include/volk/volk_32fc_deinterleave_real_32f_a16.h
+++ b/volk/include/volk/volk_32fc_deinterleave_real_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32fc_deinterleave_real_32f_a16_H
-#define INCLUDED_volk_32fc_deinterleave_real_32f_a16_H
+#ifndef INCLUDED_volk_32fc_deinterleave_real_32f_a_H
+#define INCLUDED_volk_32fc_deinterleave_real_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex vector into I vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_real_32f_a16_sse(float* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_real_32f_a_sse(float* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -44,14 +44,14 @@ static inline void volk_32fc_deinterleave_real_32f_a16_sse(float* iBuffer, const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex vector into I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_real_32f_a16_generic(float* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_real_32f_a_generic(float* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const float* complexVectorPtr = (float*)complexVector;
   float* iBufferPtr = iBuffer;
@@ -65,4 +65,4 @@ static inline void volk_32fc_deinterleave_real_32f_a16_generic(float* iBuffer, c
 
 
 
-#endif /* INCLUDED_volk_32fc_deinterleave_real_32f_a16_H */
+#endif /* INCLUDED_volk_32fc_deinterleave_real_32f_a_H */
diff --git a/volk/include/volk/volk_32fc_deinterleave_real_64f_a16.h b/volk/include/volk/volk_32fc_deinterleave_real_64f_a.h
index af392d074..70a3b1971 100644
--- a/volk/include/volk/volk_32fc_deinterleave_real_64f_a16.h
+++ b/volk/include/volk/volk_32fc_deinterleave_real_64f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32fc_deinterleave_real_64f_a16_H
-#define INCLUDED_volk_32fc_deinterleave_real_64f_a16_H
+#ifndef INCLUDED_volk_32fc_deinterleave_real_64f_a_H
+#define INCLUDED_volk_32fc_deinterleave_real_64f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Deinterleaves the complex vector into I vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_real_64f_a16_sse2(double* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_real_64f_a_sse2(double* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
 
   const float* complexVectorPtr = (float*)complexVector;
@@ -42,14 +42,14 @@ static inline void volk_32fc_deinterleave_real_64f_a16_sse2(double* iBuffer, con
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex vector into I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_deinterleave_real_64f_a16_generic(double* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_deinterleave_real_64f_a_generic(double* iBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const float* complexVectorPtr = (float*)complexVector;
   double* iBufferPtr = iBuffer;
@@ -63,4 +63,4 @@ static inline void volk_32fc_deinterleave_real_64f_a16_generic(double* iBuffer,
 
 
 
-#endif /* INCLUDED_volk_32fc_deinterleave_real_64f_a16_H */
+#endif /* INCLUDED_volk_32fc_deinterleave_real_64f_a_H */
diff --git a/volk/include/volk/volk_32fc_index_max_16u_a16.h b/volk/include/volk/volk_32fc_index_max_16u_a.h
index 532ae4e7c..312e034e2 100644
--- a/volk/include/volk/volk_32fc_index_max_16u_a16.h
+++ b/volk/include/volk/volk_32fc_index_max_16u_a.h
@@ -1,17 +1,17 @@
-#ifndef INCLUDED_volk_32fc_index_max_16u_a16_H
-#define INCLUDED_volk_32fc_index_max_16u_a16_H
+#ifndef INCLUDED_volk_32fc_index_max_16u_a_H
+#define INCLUDED_volk_32fc_index_max_16u_a_H
 
 #include <volk/volk_common.h>
 #include<inttypes.h>
 #include<stdio.h>
 #include<volk/volk_complex.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include<xmmintrin.h>
 #include<pmmintrin.h>
 
 
-static inline void volk_32fc_index_max_16u_a16_sse3(unsigned int* target, lv_32fc_t* src0, unsigned int num_bytes) {
+static inline void volk_32fc_index_max_16u_a_sse3(unsigned int* target, lv_32fc_t* src0, unsigned int num_bytes) {
   
   
   
@@ -188,8 +188,8 @@ static inline void volk_32fc_index_max_16u_a16_sse3(unsigned int* target, lv_32f
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_GENERIC
-static inline void volk_32fc_index_max_16u_a16_generic(unsigned int* target, lv_32fc_t* src0, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_32fc_index_max_16u_a_generic(unsigned int* target, lv_32fc_t* src0, unsigned int num_bytes) {
   float sq_dist = 0.0;
   float max = 0.0;
   unsigned int index = 0;
@@ -212,4 +212,4 @@ static inline void volk_32fc_index_max_16u_a16_generic(unsigned int* target, lv_
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_32fc_index_max_16u_a16_H*/
+#endif /*INCLUDED_volk_32fc_index_max_16u_a_H*/
diff --git a/volk/include/volk/volk_32fc_magnitude_32f_a16.h b/volk/include/volk/volk_32fc_magnitude_32f_a.h
index be7216dce..f18e9bc0b 100644
--- a/volk/include/volk/volk_32fc_magnitude_32f_a16.h
+++ b/volk/include/volk/volk_32fc_magnitude_32f_a.h
@@ -1,11 +1,11 @@
-#ifndef INCLUDED_volk_32fc_magnitude_32f_a16_H
-#define INCLUDED_volk_32fc_magnitude_32f_a16_H
+#ifndef INCLUDED_volk_32fc_magnitude_32f_a_H
+#define INCLUDED_volk_32fc_magnitude_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
   /*!
     \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -13,7 +13,7 @@
     \param magnitudeVector The vector containing the real output values
     \param num_points The number of complex values in complexVector to be calculated and stored into cVector
   */
-static inline void volk_32fc_magnitude_32f_a16_sse3(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_magnitude_32f_a_sse3(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -48,7 +48,7 @@ static inline void volk_32fc_magnitude_32f_a16_sse3(float* magnitudeVector, cons
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
   /*!
     \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
@@ -56,7 +56,7 @@ static inline void volk_32fc_magnitude_32f_a16_sse3(float* magnitudeVector, cons
     \param magnitudeVector The vector containing the real output values
     \param num_points The number of complex values in complexVector to be calculated and stored into cVector
   */
-static inline void volk_32fc_magnitude_32f_a16_sse(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_magnitude_32f_a_sse(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
     
@@ -96,14 +96,14 @@ static inline void volk_32fc_magnitude_32f_a16_sse(float* magnitudeVector, const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
     \param complexVector The vector containing the complex input values
     \param magnitudeVector The vector containing the real output values
     \param num_points The number of complex values in complexVector to be calculated and stored into cVector
   */
-static inline void volk_32fc_magnitude_32f_a16_generic(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
+static inline void volk_32fc_magnitude_32f_a_generic(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   float* magnitudeVectorPtr = magnitudeVector;
   unsigned int number = 0;
@@ -115,18 +115,18 @@ static inline void volk_32fc_magnitude_32f_a16_generic(float* magnitudeVector, c
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Calculates the magnitude of the complexVector and stores the results in the magnitudeVector
     \param complexVector The vector containing the complex input values
     \param magnitudeVector The vector containing the real output values
     \param num_points The number of complex values in complexVector to be calculated and stored into cVector
   */
-extern void volk_32fc_magnitude_32f_a16_orc_impl(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points);
-static inline void volk_32fc_magnitude_32f_a16_orc(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
-    volk_32fc_magnitude_32f_a16_orc_impl(magnitudeVector, complexVector, num_points);
+extern void volk_32fc_magnitude_32f_a_orc_impl(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points);
+static inline void volk_32fc_magnitude_32f_a_orc(float* magnitudeVector, const lv_32fc_t* complexVector, unsigned int num_points){
+    volk_32fc_magnitude_32f_a_orc_impl(magnitudeVector, complexVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32fc_magnitude_32f_a16_H */
+#endif /* INCLUDED_volk_32fc_magnitude_32f_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_atan2_32f_a16.h b/volk/include/volk/volk_32fc_s32f_atan2_32f_a.h
index e9f74438d..9304b0c28 100644
--- a/volk/include/volk/volk_32fc_s32f_atan2_32f_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_atan2_32f_a.h
@@ -1,14 +1,14 @@
-#ifndef INCLUDED_volk_32fc_s32f_atan2_32f_a16_H
-#define INCLUDED_volk_32fc_s32f_atan2_32f_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_atan2_32f_a_H
+#define INCLUDED_volk_32fc_s32f_atan2_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -19,7 +19,7 @@
   \param normalizeFactor The atan2 results will be divided by this normalization factor.
   \param num_points The number of complex values in the input vector.
 */
-static inline void volk_32fc_s32f_atan2_32f_a16_sse4_1(float* outputVector,  const lv_32fc_t* complexVector, const float normalizeFactor, unsigned int num_points){
+static inline void volk_32fc_s32f_atan2_32f_a_sse4_1(float* outputVector,  const lv_32fc_t* complexVector, const float normalizeFactor, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   float* outPtr = outputVector;
 
@@ -27,7 +27,7 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse4_1(float* outputVector,  con
   const unsigned int quarterPoints = num_points / 4;    
   const float invNormalizeFactor = 1.0 / normalizeFactor;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 testVector = _mm_set_ps1(2*M_PI);
   __m128 correctVector = _mm_set_ps1(M_PI);
   __m128 vNormalizeFactor = _mm_set_ps1(invNormalizeFactor);
@@ -67,10 +67,10 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse4_1(float* outputVector,  con
 #endif /* LV_HAVE_SSE4_1 */
 
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -81,7 +81,7 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse4_1(float* outputVector,  con
   \param normalizeFactor The atan2 results will be divided by this normalization factor.
   \param num_points The number of complex values in the input vector.
 */
-static inline void volk_32fc_s32f_atan2_32f_a16_sse(float* outputVector,  const lv_32fc_t* complexVector, const float normalizeFactor, unsigned int num_points){
+static inline void volk_32fc_s32f_atan2_32f_a_sse(float* outputVector,  const lv_32fc_t* complexVector, const float normalizeFactor, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   float* outPtr = outputVector;
 
@@ -89,7 +89,7 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse(float* outputVector,  const
   const unsigned int quarterPoints = num_points / 4;    
   const float invNormalizeFactor = 1.0 / normalizeFactor;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 testVector = _mm_set_ps1(2*M_PI);
   __m128 correctVector = _mm_set_ps1(M_PI);
   __m128 vNormalizeFactor = _mm_set_ps1(invNormalizeFactor);
@@ -131,7 +131,7 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse(float* outputVector,  const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief performs the atan2 on the input vector and stores the results in the output vector.
   \param outputVector The vector where the results will be stored.
@@ -139,7 +139,7 @@ static inline void volk_32fc_s32f_atan2_32f_a16_sse(float* outputVector,  const
   \param normalizeFactor The atan2 results will be divided by this normalization factor.
   \param num_points The number of complex values in the input vector.
 */
-static inline void volk_32fc_s32f_atan2_32f_a16_generic(float* outputVector, const lv_32fc_t* inputVector, const float normalizeFactor, unsigned int num_points){
+static inline void volk_32fc_s32f_atan2_32f_a_generic(float* outputVector, const lv_32fc_t* inputVector, const float normalizeFactor, unsigned int num_points){
   float* outPtr = outputVector;
   const float* inPtr = (float*)inputVector;
   const float invNormalizeFactor = 1.0 / normalizeFactor;
@@ -155,4 +155,4 @@ static inline void volk_32fc_s32f_atan2_32f_a16_generic(float* outputVector, con
 
 
 
-#endif /* INCLUDED_volk_32fc_s32f_atan2_32f_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_atan2_32f_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_deinterleave_real_16i_a16.h b/volk/include/volk/volk_32fc_s32f_deinterleave_real_16i_a.h
index 31465bff9..1c17fb70c 100644
--- a/volk/include/volk/volk_32fc_s32f_deinterleave_real_16i_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_deinterleave_real_16i_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a16_H
-#define INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a_H
+#define INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex vector, multiply the value by the scalar, convert to 16t, and in I vector data
@@ -13,7 +14,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_s32f_deinterleave_real_16i_a16_sse(int16_t* iBuffer, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_32fc_s32f_deinterleave_real_16i_a_sse(int16_t* iBuffer, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -24,7 +25,7 @@ static inline void volk_32fc_s32f_deinterleave_real_16i_a16_sse(int16_t* iBuffer
 
   __m128 cplxValue1, cplxValue2, iValue;
 
-  float floatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
   for(;number < quarterPoints; number++){
     cplxValue1 = _mm_load_ps(complexVectorPtr);
@@ -54,7 +55,7 @@ static inline void volk_32fc_s32f_deinterleave_real_16i_a16_sse(int16_t* iBuffer
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex vector, multiply the value by the scalar, convert to 16t, and in I vector data
   \param complexVector The complex input vector
@@ -62,7 +63,7 @@ static inline void volk_32fc_s32f_deinterleave_real_16i_a16_sse(int16_t* iBuffer
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_32fc_s32f_deinterleave_real_16i_a16_generic(int16_t* iBuffer, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_32fc_s32f_deinterleave_real_16i_a_generic(int16_t* iBuffer, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   int16_t* iBufferPtr = iBuffer;
   unsigned int number = 0;
@@ -77,4 +78,4 @@ static inline void volk_32fc_s32f_deinterleave_real_16i_a16_generic(int16_t* iBu
 
 
 
-#endif /* INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_deinterleave_real_16i_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_magnitude_16i_a16.h b/volk/include/volk/volk_32fc_s32f_magnitude_16i_a.h
index 530359600..38fd609d3 100644
--- a/volk/include/volk/volk_32fc_s32f_magnitude_16i_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_magnitude_16i_a.h
@@ -1,11 +1,12 @@
-#ifndef INCLUDED_volk_32fc_s32f_magnitude_16i_a16_H
-#define INCLUDED_volk_32fc_s32f_magnitude_16i_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_magnitude_16i_a_H
+#define INCLUDED_volk_32fc_s32f_magnitude_16i_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector, scales the resulting value and stores the results in the magnitudeVector
@@ -14,7 +15,7 @@
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_32fc_s32f_magnitude_16i_a16_sse3(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_32fc_s32f_magnitude_16i_a_sse3(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -25,7 +26,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse3(int16_t* magnitudeVecto
 
   __m128 cplxValue1, cplxValue2, result;
 
-  float floatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
   for(;number < quarterPoints; number++){
     cplxValue1 = _mm_load_ps(complexVectorPtr);
@@ -60,7 +61,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse3(int16_t* magnitudeVecto
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Calculates the magnitude of the complexVector, scales the resulting value and stores the results in the magnitudeVector
@@ -69,7 +70,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse3(int16_t* magnitudeVecto
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_32fc_s32f_magnitude_16i_a16_sse(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_32fc_s32f_magnitude_16i_a_sse(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -80,7 +81,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse(int16_t* magnitudeVector
 
   __m128 cplxValue1, cplxValue2, iValue, qValue, result;
 
-  float floatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
   for(;number < quarterPoints; number++){
     cplxValue1 = _mm_load_ps(complexVectorPtr);
@@ -120,7 +121,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse(int16_t* magnitudeVector
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the magnitude of the complexVector, scales the resulting value and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
@@ -128,7 +129,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_sse(int16_t* magnitudeVector
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-static inline void volk_32fc_s32f_magnitude_16i_a16_generic(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_32fc_s32f_magnitude_16i_a_generic(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
   const float* complexVectorPtr = (float*)complexVector;
   int16_t* magnitudeVectorPtr = magnitudeVector;
   unsigned int number = 0;
@@ -140,7 +141,7 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_generic(int16_t* magnitudeVe
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Calculates the magnitude of the complexVector, scales the resulting value and stores the results in the magnitudeVector
   \param complexVector The vector containing the complex input values
@@ -148,11 +149,11 @@ static inline void volk_32fc_s32f_magnitude_16i_a16_generic(int16_t* magnitudeVe
   \param magnitudeVector The vector containing the real output values
   \param num_points The number of complex values in complexVector to be calculated and stored into cVector
 */
-extern void volk_32fc_s32f_magnitude_16i_a16_orc_impl(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points);
-static inline void volk_32fc_s32f_magnitude_16i_a16_orc(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
-    volk_32fc_s32f_magnitude_16i_a16_orc_impl(magnitudeVector, complexVector, scalar, num_points);
+extern void volk_32fc_s32f_magnitude_16i_a_orc_impl(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points);
+static inline void volk_32fc_s32f_magnitude_16i_a_orc(int16_t* magnitudeVector, const lv_32fc_t* complexVector, const float scalar, unsigned int num_points){
+    volk_32fc_s32f_magnitude_16i_a_orc_impl(magnitudeVector, complexVector, scalar, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32fc_s32f_magnitude_16i_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_magnitude_16i_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_power_32fc_a16.h b/volk/include/volk/volk_32fc_s32f_power_32fc_a.h
index 3507fdb3c..ec1d7167f 100644
--- a/volk/include/volk/volk_32fc_s32f_power_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_power_32fc_a.h
@@ -1,13 +1,21 @@
-#ifndef INCLUDED_volk_32fc_s32f_power_32fc_a16_H
-#define INCLUDED_volk_32fc_s32f_power_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_power_32fc_a_H
+#define INCLUDED_volk_32fc_s32f_power_32fc_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
+#include <math.h>
 
-#if LV_HAVE_SSE
+//! raise a complex float to a real float power
+static inline lv_32fc_t __volk_s32fc_s32f_power_s32fc_a(const lv_32fc_t exp, const float power){
+    const float arg = power*atan2f(lv_creal(exp), lv_cimag(exp));
+    const float mag = powf(lv_creal(exp)*lv_creal(exp) + lv_cimag(exp)*lv_cimag(exp), power/2);
+    return mag*lv_cmake(cosf(arg), sinf(arg));
+}
+
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -18,14 +26,14 @@
   \param power The power value to be applied to each data point
   \param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
 */
-static inline void volk_32fc_s32f_power_32fc_a16_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
+static inline void volk_32fc_s32f_power_32fc_a_sse(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
   
   lv_32fc_t* cPtr = cVector;
   const lv_32fc_t* aPtr = aVector;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 vPower = _mm_set_ps1(power);
   
   __m128 cplxValue1, cplxValue2, magnitude, phase, iValue, qValue;
@@ -72,16 +80,13 @@ static inline void volk_32fc_s32f_power_32fc_a16_sse(lv_32fc_t* cVector, const l
   number = quarterPoints * 4;
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
-  lv_32fc_t complexPower;
-  ((float*)&complexPower)[0] = power;
-  ((float*)&complexPower)[1] = 0;
   for(;number < num_points; number++){
-    *cPtr++ = lv_cpow((*aPtr++), complexPower);
+    *cPtr++ = __volk_s32fc_s32f_power_s32fc_a((*aPtr++), power);
   }
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Takes each the input complex vector value to the specified power and stores the results in the return vector
     \param cVector The vector where the results will be stored
@@ -89,16 +94,13 @@ static inline void volk_32fc_s32f_power_32fc_a16_sse(lv_32fc_t* cVector, const l
     \param power The power value to be applied to each data point
     \param num_points The number of values in aVector to be taken to the specified power level and stored into cVector
   */
-static inline void volk_32fc_s32f_power_32fc_a16_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
+static inline void volk_32fc_s32f_power_32fc_a_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const float power, unsigned int num_points){
   lv_32fc_t* cPtr = cVector;
   const lv_32fc_t* aPtr = aVector;
   unsigned int number = 0;
-  lv_32fc_t complexPower;
-  ((float*)&complexPower)[0] = power;
-  ((float*)&complexPower)[1] = 0.0;
 
   for(number = 0; number < num_points; number++){
-    *cPtr++ = lv_cpow((*aPtr++), complexPower);
+    *cPtr++ = __volk_s32fc_s32f_power_s32fc_a((*aPtr++), power);
   }
 }
 #endif /* LV_HAVE_GENERIC */
@@ -106,4 +108,4 @@ static inline void volk_32fc_s32f_power_32fc_a16_generic(lv_32fc_t* cVector, con
 
 
 
-#endif /* INCLUDED_volk_32fc_s32f_power_32fc_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_power_32fc_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_power_spectrum_32f_a16.h b/volk/include/volk/volk_32fc_s32f_power_spectrum_32f_a.h
index 39d8f7aa2..8d1959dae 100644
--- a/volk/include/volk/volk_32fc_s32f_power_spectrum_32f_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_power_spectrum_32f_a.h
@@ -1,14 +1,14 @@
-#ifndef INCLUDED_volk_32fc_s32f_power_spectrum_32f_a16_H
-#define INCLUDED_volk_32fc_s32f_power_spectrum_32f_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_power_spectrum_32f_a_H
+#define INCLUDED_volk_32fc_s32f_power_spectrum_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -19,12 +19,12 @@
   \param normalizationFactor This value is divided against all the input values before the power is calculated
   \param num_points The number of fft data points
 */
-static inline void volk_32fc_s32f_power_spectrum_32f_a16_sse3(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, unsigned int num_points){
+static inline void volk_32fc_s32f_power_spectrum_32f_a_sse3(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, unsigned int num_points){
   const float* inputPtr = (const float*)complexFFTInput;
   float* destPtr = logPowerOutput;
   uint64_t number = 0;
   const float iNormalizationFactor = 1.0 / normalizationFactor;
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 magScalar = _mm_set_ps1(10.0);
   magScalar = _mm_div_ps(magScalar, logf4(magScalar));
 
@@ -88,7 +88,7 @@ static inline void volk_32fc_s32f_power_spectrum_32f_a16_sse3(float* logPowerOut
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the log10 power value for each input point
   \param logPowerOutput The 10.0 * log10(r*r + i*i) for each data point
@@ -96,7 +96,7 @@ static inline void volk_32fc_s32f_power_spectrum_32f_a16_sse3(float* logPowerOut
   \param normalizationFactor This value is divided agains all the input values before the power is calculated
   \param num_points The number of fft data points
 */
-static inline void volk_32fc_s32f_power_spectrum_32f_a16_generic(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, unsigned int num_points){
+static inline void volk_32fc_s32f_power_spectrum_32f_a_generic(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, unsigned int num_points){
   // Calculate the Power of the complex point
   const float* inputPtr = (float*)complexFFTInput;
   float* realFFTDataPointsPtr = logPowerOutput;
@@ -123,4 +123,4 @@ static inline void volk_32fc_s32f_power_spectrum_32f_a16_generic(float* logPower
 
 
 
-#endif /* INCLUDED_volk_32fc_s32f_power_spectrum_32f_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_power_spectrum_32f_a_H */
diff --git a/volk/include/volk/volk_32fc_s32f_x2_power_spectral_density_32f_a16.h b/volk/include/volk/volk_32fc_s32f_x2_power_spectral_density_32f_a.h
index 0120b5307..fc635f171 100644
--- a/volk/include/volk/volk_32fc_s32f_x2_power_spectral_density_32f_a16.h
+++ b/volk/include/volk/volk_32fc_s32f_x2_power_spectral_density_32f_a.h
@@ -1,14 +1,14 @@
-#ifndef INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a16_H
-#define INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a16_H
+#ifndef INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a_H
+#define INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <math.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
 #include <simdmath.h>
 #endif /* LV_HAVE_LIB_SIMDMATH */
 
@@ -20,14 +20,14 @@
   \param rbw The resolution bandwith of the fft spectrum
   \param num_points The number of fft data points
 */
-static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a16_sse3(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, const float rbw, unsigned int num_points){
+static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a_sse3(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, const float rbw, unsigned int num_points){
   const float* inputPtr = (const float*)complexFFTInput;
   float* destPtr = logPowerOutput;
   uint64_t number = 0;
   const float iRBW = 1.0 / rbw;
   const float iNormalizationFactor = 1.0 / normalizationFactor;
 
-#if LV_HAVE_LIB_SIMDMATH
+#ifdef LV_HAVE_LIB_SIMDMATH
   __m128 magScalar = _mm_set_ps1(10.0);
   magScalar = _mm_div_ps(magScalar, logf4(magScalar));
 
@@ -94,7 +94,7 @@ static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a16_sse3(float*
 }
 #endif /* LV_HAVE_SSE3 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Calculates the log10 power value divided by the RBW for each input point
   \param logPowerOutput The 10.0 * log10((r*r + i*i)/RBW) for each data point
@@ -103,7 +103,7 @@ static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a16_sse3(float*
   \param rbw The resolution bandwith of the fft spectrum
   \param num_points The number of fft data points
 */
-static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a16_generic(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, const float rbw, unsigned int num_points){
+static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a_generic(float* logPowerOutput, const lv_32fc_t* complexFFTInput, const float normalizationFactor, const float rbw, unsigned int num_points){
   // Calculate the Power of the complex point
   const float* inputPtr = (float*)complexFFTInput;
   float* realFFTDataPointsPtr = logPowerOutput;
@@ -131,4 +131,4 @@ static inline void volk_32fc_s32f_x2_power_spectral_density_32f_a16_generic(floa
 
 
 
-#endif /* INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a16_H */
+#endif /* INCLUDED_volk_32fc_s32f_x2_power_spectral_density_32f_a_H */
diff --git a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a16.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h
index a01971df3..a6c21336d 100644
--- a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h
@@ -1,14 +1,15 @@
-#ifndef INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a16_H
-#define INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a_H
+#define INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a_H
 
+#include <volk/volk_common.h>
 #include<volk/volk_complex.h>
 #include<stdio.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
 
-static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
   float * res = (float*) result;
   float * in = (float*) input;
@@ -62,9 +63,9 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_generic(lv_32fc_t* r
 #if LV_HAVE_SSE && LV_HAVE_64
 
 
-static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_sse(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a_sse(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
-  static const uint32_t conjugator[4] __attribute__((aligned(16)))= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
+  __VOLK_ATTR_ALIGNED(16) static const uint32_t conjugator[4]= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
   
 
 
@@ -203,9 +204,9 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_sse(lv_32fc_t* resul
 #endif
 
 #if LV_HAVE_SSE && LV_HAVE_32
-static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_sse_32(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a_sse_32(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
-  static const uint32_t conjugator[4] __attribute__((aligned(16)))= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
+  __VOLK_ATTR_ALIGNED(16) static const uint32_t conjugator[4]= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
 
   int bound = num_bytes >> 4;
   int leftovers = num_bytes % 16;
@@ -341,4 +342,4 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a16_sse_32(lv_32fc_t* re
 
 
 
-#endif /*INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a16_H*/
+#endif /*INCLUDED_volk_32fc_x2_conjugate_dot_prod_32fc_a_H*/
diff --git a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
index 2fa5918cc..6b22d9f81 100644
--- a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
+++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
@@ -5,7 +5,7 @@
 #include<volk/volk_complex.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
 
 static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
@@ -57,7 +57,7 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_generic(lv_32fc_t* res
 
 #endif /*LV_HAVE_GENERIC*/
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 
 #include <xmmintrin.h>
 #include <pmmintrin.h>
@@ -66,7 +66,7 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_generic(lv_32fc_t* res
 
 static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
 
-  static const uint32_t conjugator[4] __attribute__((aligned(16)))= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
+  __VOLK_ATTR_ALIGNED(16) static const uint32_t conjugator[4]= {0x00000000, 0x80000000, 0x00000000, 0x80000000};
 
   union HalfMask {
     uint32_t intRep[4];
@@ -131,7 +131,7 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_sse3(lv_32fc_t* result
     Isum += Im;
   }
 
-  result[0] = lv_32fc_init(Rsum,Isum);
+  result[0] = lv_cmake(Rsum,Isum);
   return;
 }
 
diff --git a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a16.h b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h
index 9a7b65ab4..022a0a614 100644
--- a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h
@@ -1,15 +1,16 @@
-#ifndef INCLUDED_volk_32fc_x2_dot_prod_32fc_a16_H
-#define INCLUDED_volk_32fc_x2_dot_prod_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_x2_dot_prod_32fc_a_H
+#define INCLUDED_volk_32fc_x2_dot_prod_32fc_a_H
 
+#include <volk/volk_common.h>
 #include <volk/volk_complex.h>
 #include <stdio.h>
 #include <string.h>
 
 
-#if LV_HAVE_GENERIC 
+#ifdef LV_HAVE_GENERIC 
 
 
-static inline void volk_32fc_x2_dot_prod_32fc_a16_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_dot_prod_32fc_a_generic(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
   float * res = (float*) result;
   float * in = (float*) input;
@@ -59,7 +60,7 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_generic(lv_32fc_t* result, con
 #if LV_HAVE_SSE && LV_HAVE_64
 
 
-static inline void volk_32fc_x2_dot_prod_32fc_a16_sse_64(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_dot_prod_32fc_a_sse_64(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
 
   asm 
@@ -194,7 +195,7 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_sse_64(lv_32fc_t* result, cons
 
 #if LV_HAVE_SSE && LV_HAVE_32
 
-static inline void volk_32fc_x2_dot_prod_32fc_a16_sse_32(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_dot_prod_32fc_a_sse_32(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
   asm volatile 
     (
@@ -316,11 +317,11 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_sse_32(lv_32fc_t* result, cons
 
 #endif /*LV_HAVE_SSE*/  
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 
 #include <pmmintrin.h>
 
-static inline void volk_32fc_x2_dot_prod_32fc_a16_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+static inline void volk_32fc_x2_dot_prod_32fc_a_sse3(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
   
 
   lv_32fc_t dotProduct;
@@ -358,7 +359,7 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_sse3(lv_32fc_t* result, const
     b += 2;
   }
 
-  lv_32fc_t dotProductVector[2] __attribute__((aligned(16)));
+  __VOLK_ATTR_ALIGNED(16) lv_32fc_t dotProductVector[2];
 
   _mm_store_ps((float*)dotProductVector,dotProdVal); // Store the results back into the dot product vector
 
@@ -373,12 +374,12 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_sse3(lv_32fc_t* result, const
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 
 #include <smmintrin.h>
 
-static inline void volk_32fc_x2_dot_prod_32fc_a16_sse4_1(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
-  volk_32fc_x2_dot_prod_32fc_a16_sse3(result, input, taps, num_bytes);
+static inline void volk_32fc_x2_dot_prod_32fc_a_sse4_1(lv_32fc_t* result, const lv_32fc_t* input, const lv_32fc_t* taps, unsigned int num_bytes) {
+  volk_32fc_x2_dot_prod_32fc_a_sse3(result, input, taps, num_bytes);
   // SSE3 version runs twice as fast as the SSE4.1 version, so turning off SSE4 version for now
    /* 
     __m128 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, real0, real1, im0, im1;
@@ -465,4 +466,4 @@ static inline void volk_32fc_x2_dot_prod_32fc_a16_sse4_1(lv_32fc_t* result, cons
 
 #endif /*LV_HAVE_SSE4_1*/
 
-#endif /*INCLUDED_volk_32fc_x2_dot_prod_32fc_a16_H*/
+#endif /*INCLUDED_volk_32fc_x2_dot_prod_32fc_a_H*/
diff --git a/volk/include/volk/volk_32fc_x2_multiply_32fc_a16.h b/volk/include/volk/volk_32fc_x2_multiply_32fc_a.h
index b4214f5d2..18dd092e8 100644
--- a/volk/include/volk/volk_32fc_x2_multiply_32fc_a16.h
+++ b/volk/include/volk/volk_32fc_x2_multiply_32fc_a.h
@@ -1,12 +1,12 @@
-#ifndef INCLUDED_volk_32fc_x2_multiply_32fc_a16_H
-#define INCLUDED_volk_32fc_x2_multiply_32fc_a16_H
+#ifndef INCLUDED_volk_32fc_x2_multiply_32fc_a_H
+#define INCLUDED_volk_32fc_x2_multiply_32fc_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <volk/volk_complex.h>
 #include <float.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include <pmmintrin.h>
   /*!
     \brief Multiplies the two input complex vectors and stores their results in the third vector
@@ -15,7 +15,7 @@
     \param bVector One of the vectors to be multiplied
     \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
   */
-static inline void volk_32fc_x2_multiply_32fc_a16_sse3(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
+static inline void volk_32fc_x2_multiply_32fc_a_sse3(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
   unsigned int number = 0;
     const unsigned int halfPoints = num_points / 2;
 
@@ -53,7 +53,7 @@ static inline void volk_32fc_x2_multiply_32fc_a16_sse3(lv_32fc_t* cVector, const
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Multiplies the two input complex vectors and stores their results in the third vector
     \param cVector The vector where the results will be stored
@@ -61,7 +61,7 @@ static inline void volk_32fc_x2_multiply_32fc_a16_sse3(lv_32fc_t* cVector, const
     \param bVector One of the vectors to be multiplied
     \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
   */
-static inline void volk_32fc_x2_multiply_32fc_a16_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
+static inline void volk_32fc_x2_multiply_32fc_a_generic(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
     lv_32fc_t* cPtr = cVector;
     const lv_32fc_t* aPtr = aVector;
     const lv_32fc_t* bPtr=  bVector;
@@ -73,7 +73,7 @@ static inline void volk_32fc_x2_multiply_32fc_a16_generic(lv_32fc_t* cVector, co
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Multiplies the two input complex vectors and stores their results in the third vector
     \param cVector The vector where the results will be stored
@@ -81,9 +81,9 @@ static inline void volk_32fc_x2_multiply_32fc_a16_generic(lv_32fc_t* cVector, co
     \param bVector One of the vectors to be multiplied
     \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
   */
-extern void volk_32fc_x2_multiply_32fc_a16_orc_impl(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points);
-static inline void volk_32fc_x2_multiply_32fc_a16_orc(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
-    volk_32fc_x2_multiply_32fc_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32fc_x2_multiply_32fc_a_orc_impl(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points);
+static inline void volk_32fc_x2_multiply_32fc_a_orc(lv_32fc_t* cVector, const lv_32fc_t* aVector, const lv_32fc_t* bVector, unsigned int num_points){
+    volk_32fc_x2_multiply_32fc_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
@@ -91,4 +91,4 @@ static inline void volk_32fc_x2_multiply_32fc_a16_orc(lv_32fc_t* cVector, const
 
 
 
-#endif /* INCLUDED_volk_32fc_x2_multiply_32fc_a16_H */
+#endif /* INCLUDED_volk_32fc_x2_multiply_32fc_a_H */
diff --git a/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16.h b/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h
index 6a863b16d..be7a4ffe9 100644
--- a/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16.h
+++ b/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h
@@ -1,16 +1,16 @@
-#ifndef INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_H
-#define INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_H
+#ifndef INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_H
+#define INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_H
 
 #include<inttypes.h>
 #include<stdio.h>
 #include<volk/volk_complex.h>
 #include <string.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include<xmmintrin.h>
 #include<pmmintrin.h>
 
-static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_sse3(float* target, lv_32fc_t* src0, lv_32fc_t* points, float scalar, unsigned int num_bytes) {
+static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_sse3(float* target, lv_32fc_t* src0, lv_32fc_t* points, float scalar, unsigned int num_bytes) {
   
 
   __m128 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8;
@@ -105,8 +105,8 @@ static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_sse3(float*
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_GENERIC
-static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, float scalar, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, float scalar, unsigned int num_bytes) {
   lv_32fc_t diff;
   float sq_dist;
   int i = 0; 
@@ -123,4 +123,4 @@ static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_generic(flo
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16_H*/
+#endif /*INCLUDED_volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_H*/
diff --git a/volk/include/volk/volk_32fc_x2_square_dist_32f_a16.h b/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h
index 406097fc8..c21d00491 100644
--- a/volk/include/volk/volk_32fc_x2_square_dist_32f_a16.h
+++ b/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h
@@ -1,15 +1,15 @@
-#ifndef INCLUDED_volk_32fc_x2_square_dist_32f_a16_H
-#define INCLUDED_volk_32fc_x2_square_dist_32f_a16_H
+#ifndef INCLUDED_volk_32fc_x2_square_dist_32f_a_H
+#define INCLUDED_volk_32fc_x2_square_dist_32f_a_H
 
 #include<inttypes.h>
 #include<stdio.h>
 #include<volk/volk_complex.h>
 
-#if LV_HAVE_SSE3
+#ifdef LV_HAVE_SSE3
 #include<xmmintrin.h>
 #include<pmmintrin.h>
 
-static inline void volk_32fc_x2_square_dist_32f_a16_sse3(float* target, lv_32fc_t* src0, lv_32fc_t* points, unsigned int num_bytes) {
+static inline void volk_32fc_x2_square_dist_32f_a_sse3(float* target, lv_32fc_t* src0, lv_32fc_t* points, unsigned int num_bytes) {
   
 
   __m128 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
@@ -91,8 +91,8 @@ static inline void volk_32fc_x2_square_dist_32f_a16_sse3(float* target, lv_32fc_
 
 #endif /*LV_HAVE_SSE3*/
 
-#if LV_HAVE_GENERIC
-static inline void volk_32fc_x2_square_dist_32f_a16_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, unsigned int num_bytes) {
+#ifdef LV_HAVE_GENERIC
+static inline void volk_32fc_x2_square_dist_32f_a_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, unsigned int num_bytes) {
   lv_32fc_t diff;
   float sq_dist;
   int i = 0; 
@@ -109,4 +109,4 @@ static inline void volk_32fc_x2_square_dist_32f_a16_generic(float* target, lv_32
 #endif /*LV_HAVE_GENERIC*/
 
 
-#endif /*INCLUDED_volk_32fc_x2_square_dist_32f_a16_H*/
+#endif /*INCLUDED_volk_32fc_x2_square_dist_32f_a_H*/
diff --git a/volk/include/volk/volk_32i_s32f_convert_32f_a16.h b/volk/include/volk/volk_32i_s32f_convert_32f_a.h
index 0fcadd9cb..558142869 100644
--- a/volk/include/volk/volk_32i_s32f_convert_32f_a16.h
+++ b/volk/include/volk/volk_32i_s32f_convert_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32i_s32f_convert_32f_a16_H
-#define INCLUDED_volk_32i_s32f_convert_32f_a16_H
+#ifndef INCLUDED_volk_32i_s32f_convert_32f_a_H
+#define INCLUDED_volk_32i_s32f_convert_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 
   /*!
@@ -14,7 +14,7 @@
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32i_s32f_convert_32f_a16_sse2(float* outputVector, const int32_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32i_s32f_convert_32f_a_sse2(float* outputVector, const int32_t* inputVector, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
     
@@ -47,7 +47,7 @@ static inline void volk_32i_s32f_convert_32f_a16_sse2(float* outputVector, const
 #endif /* LV_HAVE_SSE2 */
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 32 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 32 bit input data buffer
@@ -55,7 +55,7 @@ static inline void volk_32i_s32f_convert_32f_a16_sse2(float* outputVector, const
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_32i_s32f_convert_32f_a16_generic(float* outputVector, const int32_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_32i_s32f_convert_32f_a_generic(float* outputVector, const int32_t* inputVector, const float scalar, unsigned int num_points){
   float* outputVectorPtr = outputVector;
   const int32_t* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -70,4 +70,4 @@ static inline void volk_32i_s32f_convert_32f_a16_generic(float* outputVector, co
 
 
 
-#endif /* INCLUDED_volk_32i_s32f_convert_32f_a16_H */
+#endif /* INCLUDED_volk_32i_s32f_convert_32f_a_H */
diff --git a/volk/include/volk/volk_32i_s32f_convert_32f_u.h b/volk/include/volk/volk_32i_s32f_convert_32f_u.h
index 1dd6422f8..d8afd218c 100644
--- a/volk/include/volk/volk_32i_s32f_convert_32f_u.h
+++ b/volk/include/volk/volk_32i_s32f_convert_32f_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 
   /*!
@@ -48,7 +48,7 @@ static inline void volk_32i_s32f_convert_32f_u_sse2(float* outputVector, const i
 #endif /* LV_HAVE_SSE2 */
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 32 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 32 bit input data buffer
diff --git a/volk/include/volk/volk_32i_x2_and_32i_a16.h b/volk/include/volk/volk_32i_x2_and_32i_a.h
index 3baa1d856..dcd63d98e 100644
--- a/volk/include/volk/volk_32i_x2_and_32i_a16.h
+++ b/volk/include/volk/volk_32i_x2_and_32i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32i_x2_and_32i_a16_H
-#define INCLUDED_volk_32i_x2_and_32i_a16_H
+#ifndef INCLUDED_volk_32i_x2_and_32i_a_H
+#define INCLUDED_volk_32i_x2_and_32i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Ands the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param bVector One of the vectors
   \param num_points The number of values in aVector and bVector to be anded together and stored into cVector
 */
-static inline void volk_32i_x2_and_32i_a16_sse(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+static inline void volk_32i_x2_and_32i_a_sse(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,7 @@ static inline void volk_32i_x2_and_32i_a16_sse(int32_t* cVector, const int32_t*
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Ands the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -51,7 +51,7 @@ static inline void volk_32i_x2_and_32i_a16_sse(int32_t* cVector, const int32_t*
   \param bVector One of the vectors
   \param num_points The number of values in aVector and bVector to be anded together and stored into cVector
 */
-static inline void volk_32i_x2_and_32i_a16_generic(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+static inline void volk_32i_x2_and_32i_a_generic(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
     int32_t* cPtr = cVector;
     const int32_t* aPtr = aVector;
     const int32_t* bPtr=  bVector;
@@ -63,7 +63,7 @@ static inline void volk_32i_x2_and_32i_a16_generic(int32_t* cVector, const int32
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Ands the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -71,11 +71,11 @@ static inline void volk_32i_x2_and_32i_a16_generic(int32_t* cVector, const int32
   \param bVector One of the vectors
   \param num_points The number of values in aVector and bVector to be anded together and stored into cVector
 */
-extern void volk_32i_x2_and_32i_a16_orc_impl(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points);
-static inline void volk_32i_x2_and_32i_a16_orc(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
-    volk_32i_x2_and_32i_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32i_x2_and_32i_a_orc_impl(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points);
+static inline void volk_32i_x2_and_32i_a_orc(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+    volk_32i_x2_and_32i_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32i_x2_and_32i_a16_H */
+#endif /* INCLUDED_volk_32i_x2_and_32i_a_H */
diff --git a/volk/include/volk/volk_32i_x2_or_32i_a16.h b/volk/include/volk/volk_32i_x2_or_32i_a.h
index 0be22f00a..243e8178c 100644
--- a/volk/include/volk/volk_32i_x2_or_32i_a16.h
+++ b/volk/include/volk/volk_32i_x2_or_32i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32i_x2_or_32i_a16_H
-#define INCLUDED_volk_32i_x2_or_32i_a16_H
+#ifndef INCLUDED_volk_32i_x2_or_32i_a_H
+#define INCLUDED_volk_32i_x2_or_32i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Ors the two input vectors and store their results in the third vector
@@ -13,7 +13,7 @@
   \param bVector One of the vectors to be ored
   \param num_points The number of values in aVector and bVector to be ored together and stored into cVector
 */
-static inline void volk_32i_x2_or_32i_a16_sse(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+static inline void volk_32i_x2_or_32i_a_sse(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int quarterPoints = num_points / 4;
 
@@ -43,7 +43,7 @@ static inline void volk_32i_x2_or_32i_a16_sse(int32_t* cVector, const int32_t* a
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Ors the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -51,7 +51,7 @@ static inline void volk_32i_x2_or_32i_a16_sse(int32_t* cVector, const int32_t* a
   \param bVector One of the vectors to be ored
   \param num_points The number of values in aVector and bVector to be ored together and stored into cVector
 */
-static inline void volk_32i_x2_or_32i_a16_generic(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+static inline void volk_32i_x2_or_32i_a_generic(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
     int32_t* cPtr = cVector;
     const int32_t* aPtr = aVector;
     const int32_t* bPtr=  bVector;
@@ -63,7 +63,7 @@ static inline void volk_32i_x2_or_32i_a16_generic(int32_t* cVector, const int32_
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
 /*!
   \brief Ors the two input vectors and store their results in the third vector
   \param cVector The vector where the results will be stored
@@ -71,11 +71,11 @@ static inline void volk_32i_x2_or_32i_a16_generic(int32_t* cVector, const int32_
   \param bVector One of the vectors to be ored
   \param num_points The number of values in aVector and bVector to be ored together and stored into cVector
 */
-extern void volk_32i_x2_or_32i_a16_orc_impl(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points);
-static inline void volk_32i_x2_or_32i_a16_orc(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
-    volk_32i_x2_or_32i_a16_orc_impl(cVector, aVector, bVector, num_points);
+extern void volk_32i_x2_or_32i_a_orc_impl(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points);
+static inline void volk_32i_x2_or_32i_a_orc(int32_t* cVector, const int32_t* aVector, const int32_t* bVector, unsigned int num_points){
+    volk_32i_x2_or_32i_a_orc_impl(cVector, aVector, bVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
 
-#endif /* INCLUDED_volk_32i_x2_or_32i_a16_H */
+#endif /* INCLUDED_volk_32i_x2_or_32i_a_H */
diff --git a/volk/include/volk/volk_32u_byteswap_a16.h b/volk/include/volk/volk_32u_byteswap_a.h
index 7556ec7b1..b88848096 100644
--- a/volk/include/volk/volk_32u_byteswap_a16.h
+++ b/volk/include/volk/volk_32u_byteswap_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_32u_byteswap_a16_H
-#define INCLUDED_volk_32u_byteswap_a16_H
+#ifndef INCLUDED_volk_32u_byteswap_a_H
+#define INCLUDED_volk_32u_byteswap_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 
 /*!
@@ -12,7 +12,7 @@
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_32u_byteswap_a16_sse2(uint32_t* intsToSwap, unsigned int num_points){
+static inline void volk_32u_byteswap_a_sse2(uint32_t* intsToSwap, unsigned int num_points){
   unsigned int number = 0;
 
   uint32_t* inputPtr = intsToSwap;
@@ -51,13 +51,13 @@ static inline void volk_32u_byteswap_a16_sse2(uint32_t* intsToSwap, unsigned int
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Byteswaps (in-place) an aligned vector of int32_t's.
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_32u_byteswap_a16_generic(uint32_t* intsToSwap, unsigned int num_points){
+static inline void volk_32u_byteswap_a_generic(uint32_t* intsToSwap, unsigned int num_points){
   uint32_t* inputPtr = intsToSwap;
 
   unsigned int point;
@@ -74,4 +74,4 @@ static inline void volk_32u_byteswap_a16_generic(uint32_t* intsToSwap, unsigned
 
 
 
-#endif /* INCLUDED_volk_32u_byteswap_a16_H */
+#endif /* INCLUDED_volk_32u_byteswap_a_H */
diff --git a/volk/include/volk/volk_32u_popcnt_a16.h b/volk/include/volk/volk_32u_popcnt_a.h
index f6e25e4e8..b72d605c6 100644
--- a/volk/include/volk/volk_32u_popcnt_a16.h
+++ b/volk/include/volk/volk_32u_popcnt_a.h
@@ -5,9 +5,9 @@
 #include <inttypes.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
-static inline void volk_32u_popcnt_a16_generic(uint32_t* ret, const uint32_t value) {
+static inline void volk_32u_popcnt_a_generic(uint32_t* ret, const uint32_t value) {
 
   // This is faster than a lookup table
   uint32_t retVal = value;
@@ -23,11 +23,11 @@ static inline void volk_32u_popcnt_a16_generic(uint32_t* ret, const uint32_t val
 
 #endif /*LV_HAVE_GENERIC*/
 
-#if LV_HAVE_SSE4_2
+#ifdef LV_HAVE_SSE4_2
 
 #include <nmmintrin.h>
 
-static inline void volk_32u_popcnt_a16_sse4_2(uint32_t* ret, const uint32_t value) {
+static inline void volk_32u_popcnt_a_sse4_2(uint32_t* ret, const uint32_t value) {
   *ret = _mm_popcnt_u32(value);
 }
 
diff --git a/volk/include/volk/volk_64f_convert_32f_a16.h b/volk/include/volk/volk_64f_convert_32f_a.h
index 7dca065f0..2126e4f95 100644
--- a/volk/include/volk/volk_64f_convert_32f_a16.h
+++ b/volk/include/volk/volk_64f_convert_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_64f_convert_32f_a16_H
-#define INCLUDED_volk_64f_convert_32f_a16_H
+#ifndef INCLUDED_volk_64f_convert_32f_a_H
+#define INCLUDED_volk_64f_convert_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Converts the double values into float values
@@ -12,7 +12,7 @@
     \param fVector The double vector values to be converted
     \param num_points The number of points in the two vectors to be converted
   */
-static inline void volk_64f_convert_32f_a16_sse2(float* outputVector, const double* inputVector, unsigned int num_points){
+static inline void volk_64f_convert_32f_a_sse2(float* outputVector, const double* inputVector, unsigned int num_points){
   unsigned int number = 0;
 
   const unsigned int quarterPoints = num_points / 4;
@@ -50,7 +50,7 @@ static inline void volk_64f_convert_32f_a16_sse2(float* outputVector, const doub
   \param fVector The double vector values to be converted
   \param num_points The number of points in the two vectors to be converted
 */
-static inline void volk_64f_convert_32f_a16_generic(float* outputVector, const double* inputVector, unsigned int num_points){
+static inline void volk_64f_convert_32f_a_generic(float* outputVector, const double* inputVector, unsigned int num_points){
   float* outputVectorPtr = outputVector;
   const double* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -64,4 +64,4 @@ static inline void volk_64f_convert_32f_a16_generic(float* outputVector, const d
 
 
 
-#endif /* INCLUDED_volk_64f_convert_32f_a16_H */
+#endif /* INCLUDED_volk_64f_convert_32f_a_H */
diff --git a/volk/include/volk/volk_64f_convert_32f_u.h b/volk/include/volk/volk_64f_convert_32f_u.h
index 6338c1433..5c323230a 100644
--- a/volk/include/volk/volk_64f_convert_32f_u.h
+++ b/volk/include/volk/volk_64f_convert_32f_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
   /*!
     \brief Converts the double values into float values
diff --git a/volk/include/volk/volk_64f_x2_max_64f_a16.h b/volk/include/volk/volk_64f_x2_max_64f_a.h
index 4b0c1f5f1..61a704c52 100644
--- a/volk/include/volk/volk_64f_x2_max_64f_a16.h
+++ b/volk/include/volk/volk_64f_x2_max_64f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_64f_x2_max_64f_a16_H
-#define INCLUDED_volk_64f_x2_max_64f_a16_H
+#ifndef INCLUDED_volk_64f_x2_max_64f_a_H
+#define INCLUDED_volk_64f_x2_max_64f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Selects maximum value from each entry between bVector and aVector and store their results in the cVector
@@ -13,7 +13,7 @@
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_64f_x2_max_64f_a16_sse2(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
+static inline void volk_64f_x2_max_64f_a_sse2(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int halfPoints = num_points / 2;
 
@@ -45,7 +45,7 @@ static inline void volk_64f_x2_max_64f_a16_sse2(double* cVector, const double* a
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Selects maximum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -53,7 +53,7 @@ static inline void volk_64f_x2_max_64f_a16_sse2(double* cVector, const double* a
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_64f_x2_max_64f_a16_generic(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
+static inline void volk_64f_x2_max_64f_a_generic(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
     double* cPtr = cVector;
     const double* aPtr = aVector;
     const double* bPtr=  bVector;
@@ -68,4 +68,4 @@ static inline void volk_64f_x2_max_64f_a16_generic(double* cVector, const double
 #endif /* LV_HAVE_GENERIC */
 
 
-#endif /* INCLUDED_volk_64f_x2_max_64f_a16_H */
+#endif /* INCLUDED_volk_64f_x2_max_64f_a_H */
diff --git a/volk/include/volk/volk_64f_x2_min_64f_a16.h b/volk/include/volk/volk_64f_x2_min_64f_a.h
index aa961e384..148b72c59 100644
--- a/volk/include/volk/volk_64f_x2_min_64f_a16.h
+++ b/volk/include/volk/volk_64f_x2_min_64f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_64f_x2_min_64f_a16_H
-#define INCLUDED_volk_64f_x2_min_64f_a16_H
+#ifndef INCLUDED_volk_64f_x2_min_64f_a_H
+#define INCLUDED_volk_64f_x2_min_64f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 /*!
   \brief Selects minimum value from each entry between bVector and aVector and store their results in the cVector
@@ -13,7 +13,7 @@
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_64f_x2_min_64f_a16_sse2(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
+static inline void volk_64f_x2_min_64f_a_sse2(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int halfPoints = num_points / 2;
 
@@ -45,7 +45,7 @@ static inline void volk_64f_x2_min_64f_a16_sse2(double* cVector, const double* a
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Selects minimum value from each entry between bVector and aVector and store their results in the cVector
   \param cVector The vector where the results will be stored
@@ -53,7 +53,7 @@ static inline void volk_64f_x2_min_64f_a16_sse2(double* cVector, const double* a
   \param bVector The vector to be checked
   \param num_points The number of values in aVector and bVector to be checked and stored into cVector
 */
-static inline void volk_64f_x2_min_64f_a16_generic(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
+static inline void volk_64f_x2_min_64f_a_generic(double* cVector, const double* aVector, const double* bVector, unsigned int num_points){
     double* cPtr = cVector;
     const double* aPtr = aVector;
     const double* bPtr=  bVector;
@@ -68,4 +68,4 @@ static inline void volk_64f_x2_min_64f_a16_generic(double* cVector, const double
 #endif /* LV_HAVE_GENERIC */
 
 
-#endif /* INCLUDED_volk_64f_x2_min_64f_a16_H */
+#endif /* INCLUDED_volk_64f_x2_min_64f_a_H */
diff --git a/volk/include/volk/volk_64u_byteswap_a16.h b/volk/include/volk/volk_64u_byteswap_a.h
index 0eefe0138..d4fc74a6e 100644
--- a/volk/include/volk/volk_64u_byteswap_a16.h
+++ b/volk/include/volk/volk_64u_byteswap_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_64u_byteswap_a16_H
-#define INCLUDED_volk_64u_byteswap_a16_H
+#ifndef INCLUDED_volk_64u_byteswap_a_H
+#define INCLUDED_volk_64u_byteswap_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE2
+#ifdef LV_HAVE_SSE2
 #include <emmintrin.h>
 
 /*!
@@ -12,7 +12,7 @@
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_64u_byteswap_a16_sse2(uint64_t* intsToSwap, unsigned int num_points){
+static inline void volk_64u_byteswap_a_sse2(uint64_t* intsToSwap, unsigned int num_points){
     uint32_t* inputPtr = (uint32_t*)intsToSwap;
     __m128i input, byte1, byte2, byte3, byte4, output;
     __m128i byte2mask = _mm_set1_epi32(0x00FF0000);
@@ -59,13 +59,13 @@ static inline void volk_64u_byteswap_a16_sse2(uint64_t* intsToSwap, unsigned int
 }
 #endif /* LV_HAVE_SSE2 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Byteswaps (in-place) an aligned vector of int64_t's.
   \param intsToSwap The vector of data to byte swap
   \param numDataPoints The number of data points
 */
-static inline void volk_64u_byteswap_a16_generic(uint64_t* intsToSwap, unsigned int num_points){
+static inline void volk_64u_byteswap_a_generic(uint64_t* intsToSwap, unsigned int num_points){
   uint32_t* inputPtr = (uint32_t*)intsToSwap;
   unsigned int point;
   for(point = 0; point < num_points; point++){
@@ -85,4 +85,4 @@ static inline void volk_64u_byteswap_a16_generic(uint64_t* intsToSwap, unsigned
 
 
 
-#endif /* INCLUDED_volk_64u_byteswap_a16_H */
+#endif /* INCLUDED_volk_64u_byteswap_a_H */
diff --git a/volk/include/volk/volk_64u_popcnt_a16.h b/volk/include/volk/volk_64u_popcnt_a.h
index 59511dc29..bdaa98643 100644
--- a/volk/include/volk/volk_64u_popcnt_a16.h
+++ b/volk/include/volk/volk_64u_popcnt_a.h
@@ -1,14 +1,14 @@
-#ifndef INCLUDED_volk_64u_popcnt_a16_H
-#define INCLUDED_volk_64u_popcnt_a16_H
+#ifndef INCLUDED_volk_64u_popcnt_a_H
+#define INCLUDED_volk_64u_popcnt_a_H
 
 #include <stdio.h>
 #include <inttypes.h>
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 
 
-static inline void volk_64u_popcnt_a16_generic(uint64_t* ret, const uint64_t value) {
+static inline void volk_64u_popcnt_a_generic(uint64_t* ret, const uint64_t value) {
 
   const uint32_t* valueVector = (const uint32_t*)&value;
   
@@ -40,11 +40,11 @@ static inline void volk_64u_popcnt_a16_generic(uint64_t* ret, const uint64_t val
 
 #include <nmmintrin.h>
 
-static inline void volk_64u_popcnt_a16_sse4_2(uint64_t* ret, const uint64_t value) {
+static inline void volk_64u_popcnt_a_sse4_2(uint64_t* ret, const uint64_t value) {
   *ret = _mm_popcnt_u64(value);
 
 }
 
 #endif /*LV_HAVE_SSE4_2*/
 
-#endif /*INCLUDED_volk_64u_popcnt_a16_H*/
+#endif /*INCLUDED_volk_64u_popcnt_a_H*/
diff --git a/volk/include/volk/volk_8i_convert_16i_a16.h b/volk/include/volk/volk_8i_convert_16i_a.h
index 3d7045753..9104f90cb 100644
--- a/volk/include/volk/volk_8i_convert_16i_a16.h
+++ b/volk/include/volk/volk_8i_convert_16i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_8i_convert_16i_a16_H
-#define INCLUDED_volk_8i_convert_16i_a16_H
+#ifndef INCLUDED_volk_8i_convert_16i_a_H
+#define INCLUDED_volk_8i_convert_16i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -13,7 +13,7 @@
     \param outputVector The 16 bit output data buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_8i_convert_16i_a16_sse4_1(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
+static inline void volk_8i_convert_16i_a_sse4_1(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int sixteenthPoints = num_points / 16;
 
@@ -47,14 +47,14 @@ static inline void volk_8i_convert_16i_a16_sse4_1(int16_t* outputVector, const i
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 8 bit integer data into 16 bit integer data
     \param inputVector The 8 bit input data buffer
     \param outputVector The 16 bit output data buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_8i_convert_16i_a16_generic(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
+static inline void volk_8i_convert_16i_a_generic(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
   int16_t* outputVectorPtr = outputVector;
   const int8_t* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -65,16 +65,16 @@ static inline void volk_8i_convert_16i_a16_generic(int16_t* outputVector, const
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Converts the input 8 bit integer data into 16 bit integer data
     \param inputVector The 8 bit input data buffer
     \param outputVector The 16 bit output data buffer
     \param num_points The number of data values to be converted
   */
-extern void volk_8i_convert_16i_a16_orc_impl(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points);
-static inline void volk_8i_convert_16i_a16_orc(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
-    volk_8i_convert_16i_a16_orc_impl(outputVector, inputVector, num_points);
+extern void volk_8i_convert_16i_a_orc_impl(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points);
+static inline void volk_8i_convert_16i_a_orc(int16_t* outputVector, const int8_t* inputVector, unsigned int num_points){
+    volk_8i_convert_16i_a_orc_impl(outputVector, inputVector, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
diff --git a/volk/include/volk/volk_8i_convert_16i_u.h b/volk/include/volk/volk_8i_convert_16i_u.h
index bcff13406..7d7104f52 100644
--- a/volk/include/volk/volk_8i_convert_16i_u.h
+++ b/volk/include/volk/volk_8i_convert_16i_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -48,7 +48,7 @@ static inline void volk_8i_convert_16i_u_sse4_1(int16_t* outputVector, const int
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 8 bit integer data into 16 bit integer data
     \param inputVector The 8 bit input data buffer
diff --git a/volk/include/volk/volk_8i_s32f_convert_32f_a16.h b/volk/include/volk/volk_8i_s32f_convert_32f_a.h
index 99a24ec10..7f2623ac6 100644
--- a/volk/include/volk/volk_8i_s32f_convert_32f_a16.h
+++ b/volk/include/volk/volk_8i_s32f_convert_32f_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_8i_s32f_convert_32f_a16_H
-#define INCLUDED_volk_8i_s32f_convert_32f_a16_H
+#ifndef INCLUDED_volk_8i_s32f_convert_32f_a_H
+#define INCLUDED_volk_8i_s32f_convert_32f_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -14,7 +14,7 @@
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_8i_s32f_convert_32f_a16_sse4_1(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_8i_s32f_convert_32f_a_sse4_1(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
     unsigned int number = 0;
     const unsigned int sixteenthPoints = num_points / 16;
     
@@ -66,7 +66,7 @@ static inline void volk_8i_s32f_convert_32f_a16_sse4_1(float* outputVector, cons
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 8 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 8 bit input data buffer
@@ -74,7 +74,7 @@ static inline void volk_8i_s32f_convert_32f_a16_sse4_1(float* outputVector, cons
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-static inline void volk_8i_s32f_convert_32f_a16_generic(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
+static inline void volk_8i_s32f_convert_32f_a_generic(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
   float* outputVectorPtr = outputVector;
   const int8_t* inputVectorPtr = inputVector;
   unsigned int number = 0;
@@ -86,7 +86,7 @@ static inline void volk_8i_s32f_convert_32f_a16_generic(float* outputVector, con
 }
 #endif /* LV_HAVE_GENERIC */
 
-#if LV_HAVE_ORC
+#ifdef LV_HAVE_ORC
   /*!
     \brief Converts the input 8 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 8 bit input data buffer
@@ -94,10 +94,10 @@ static inline void volk_8i_s32f_convert_32f_a16_generic(float* outputVector, con
     \param scalar The value divided against each point in the output buffer
     \param num_points The number of data values to be converted
   */
-extern void volk_8i_s32f_convert_32f_a16_orc_impl(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points);
-static inline void volk_8i_s32f_convert_32f_a16_orc(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
+extern void volk_8i_s32f_convert_32f_a_orc_impl(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points);
+static inline void volk_8i_s32f_convert_32f_a_orc(float* outputVector, const int8_t* inputVector, const float scalar, unsigned int num_points){
     float invscalar = 1.0 / scalar;
-    volk_8i_s32f_convert_32f_a16_orc_impl(outputVector, inputVector, invscalar, num_points);
+    volk_8i_s32f_convert_32f_a_orc_impl(outputVector, inputVector, invscalar, num_points);
 }
 #endif /* LV_HAVE_ORC */
 
diff --git a/volk/include/volk/volk_8i_s32f_convert_32f_u.h b/volk/include/volk/volk_8i_s32f_convert_32f_u.h
index 1e30957e8..3cd6bb67c 100644
--- a/volk/include/volk/volk_8i_s32f_convert_32f_u.h
+++ b/volk/include/volk/volk_8i_s32f_convert_32f_u.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 
   /*!
@@ -67,7 +67,7 @@ static inline void volk_8i_s32f_convert_32f_u_sse4_1(float* outputVector, const
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
   /*!
     \brief Converts the input 8 bit integer data into floating point data, and divides the each floating point output data point by the scalar value
     \param inputVector The 8 bit input data buffer
diff --git a/volk/include/volk/volk_8ic_deinterleave_16i_x2_a16.h b/volk/include/volk/volk_8ic_deinterleave_16i_x2_a.h
index 91c9b2c58..8f13da32f 100644
--- a/volk/include/volk/volk_8ic_deinterleave_16i_x2_a16.h
+++ b/volk/include/volk/volk_8ic_deinterleave_16i_x2_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_8ic_deinterleave_16i_x2_a16_H
-#define INCLUDED_volk_8ic_deinterleave_16i_x2_a16_H
+#ifndef INCLUDED_volk_8ic_deinterleave_16i_x2_a_H
+#define INCLUDED_volk_8ic_deinterleave_16i_x2_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I & Q 16 bit vector data
@@ -13,7 +13,7 @@
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_16i_x2_a16_sse4_1(int16_t* iBuffer, int16_t* qBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_16i_x2_a_sse4_1(int16_t* iBuffer, int16_t* qBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -51,7 +51,7 @@ static inline void volk_8ic_deinterleave_16i_x2_a16_sse4_1(int16_t* iBuffer, int
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 8 bit vector into I & Q 16 bit vector data
   \param complexVector The complex input vector
@@ -59,7 +59,7 @@ static inline void volk_8ic_deinterleave_16i_x2_a16_sse4_1(int16_t* iBuffer, int
   \param qBuffer The Q buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_16i_x2_a16_generic(int16_t* iBuffer, int16_t* qBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_16i_x2_a_generic(int16_t* iBuffer, int16_t* qBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   const int8_t* complexVectorPtr = (const int8_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
   int16_t* qBufferPtr = qBuffer;
@@ -74,4 +74,4 @@ static inline void volk_8ic_deinterleave_16i_x2_a16_generic(int16_t* iBuffer, in
 
 
 
-#endif /* INCLUDED_volk_8ic_deinterleave_16i_x2_a16_H */
+#endif /* INCLUDED_volk_8ic_deinterleave_16i_x2_a_H */
diff --git a/volk/include/volk/volk_8ic_deinterleave_real_16i_a16.h b/volk/include/volk/volk_8ic_deinterleave_real_16i_a.h
index bf3dc20dd..d26b3d0d0 100644
--- a/volk/include/volk/volk_8ic_deinterleave_real_16i_a16.h
+++ b/volk/include/volk/volk_8ic_deinterleave_real_16i_a.h
@@ -1,10 +1,10 @@
-#ifndef INCLUDED_volk_8ic_deinterleave_real_16i_a16_H
-#define INCLUDED_volk_8ic_deinterleave_real_16i_a16_H
+#ifndef INCLUDED_volk_8ic_deinterleave_real_16i_a_H
+#define INCLUDED_volk_8ic_deinterleave_real_16i_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I 16 bit vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_real_16i_a16_sse4_1(int16_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_real_16i_a_sse4_1(int16_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -42,14 +42,14 @@ static inline void volk_8ic_deinterleave_real_16i_a16_sse4_1(int16_t* iBuffer, c
 #endif /* LV_HAVE_SSE4_1 */
 
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 8 bit vector into I 16 bit vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_real_16i_a16_generic(int16_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_real_16i_a_generic(int16_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (const int8_t*)complexVector;
   int16_t* iBufferPtr = iBuffer;
@@ -63,4 +63,4 @@ static inline void volk_8ic_deinterleave_real_16i_a16_generic(int16_t* iBuffer,
 
 
 
-#endif /* INCLUDED_volk_8ic_deinterleave_real_16i_a16_H */
+#endif /* INCLUDED_volk_8ic_deinterleave_real_16i_a_H */
diff --git a/volk/include/volk/volk_8ic_deinterleave_real_8i_a16.h b/volk/include/volk/volk_8ic_deinterleave_real_8i_a.h
index 13de79423..21efed83e 100644
--- a/volk/include/volk/volk_8ic_deinterleave_real_8i_a16.h
+++ b/volk/include/volk/volk_8ic_deinterleave_real_8i_a.h
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSSE3
+#ifdef LV_HAVE_SSSE3
 #include <tmmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I vector data
@@ -12,7 +12,7 @@
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_real_8i_a16_ssse3(int8_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_real_8i_a_ssse3(int8_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int8_t* iBufferPtr = iBuffer;
@@ -43,14 +43,14 @@ static inline void volk_8ic_deinterleave_real_8i_a16_ssse3(int8_t* iBuffer, cons
 }
 #endif /* LV_HAVE_SSSE3 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 8 bit vector into I vector data
   \param complexVector The complex input vector
   \param iBuffer The I buffer output data
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_deinterleave_real_8i_a16_generic(int8_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
+static inline void volk_8ic_deinterleave_real_8i_a_generic(int8_t* iBuffer, const lv_8sc_t* complexVector, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (int8_t*)complexVector;
   int8_t* iBufferPtr = iBuffer;
diff --git a/volk/include/volk/volk_8ic_s32f_deinterleave_32f_x2_a16.h b/volk/include/volk/volk_8ic_s32f_deinterleave_32f_x2_a.h
index 22c3ebb23..b723c6f8b 100644
--- a/volk/include/volk/volk_8ic_s32f_deinterleave_32f_x2_a16.h
+++ b/volk/include/volk/volk_8ic_s32f_deinterleave_32f_x2_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a16_H
-#define INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a16_H
+#ifndef INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a_H
+#define INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I & Q floating point vector data
@@ -14,7 +15,7 @@
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse4_1(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_32f_x2_a_sse4_1(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
 
@@ -74,7 +75,7 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse4_1(float* iBuffer,
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I & Q floating point vector data
@@ -84,7 +85,7 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse4_1(float* iBuffer,
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_32f_x2_a_sse(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
 
@@ -95,7 +96,7 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, flo
   __m128 invScalar = _mm_set_ps1(1.0/scalar);
   int8_t* complexVectorPtr = (int8_t*)complexVector;
 
-  float floatBuffer[8] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[8];
 
   for(;number < quarterPoints; number++){
     floatBuffer[0] = (float)(complexVectorPtr[0]);
@@ -136,7 +137,7 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, flo
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 8 bit vector into I & Q floating point vector data
   \param complexVector The complex input vector
@@ -145,7 +146,7 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_sse(float* iBuffer, flo
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_generic(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_32f_x2_a_generic(float* iBuffer, float* qBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   const int8_t* complexVectorPtr = (const int8_t*)complexVector;
   float* iBufferPtr = iBuffer;
   float* qBufferPtr = qBuffer;
@@ -161,4 +162,4 @@ static inline void volk_8ic_s32f_deinterleave_32f_x2_a16_generic(float* iBuffer,
 
 
 
-#endif /* INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a16_H */
+#endif /* INCLUDED_volk_8ic_s32f_deinterleave_32f_x2_a_H */
diff --git a/volk/include/volk/volk_8ic_s32f_deinterleave_real_32f_a16.h b/volk/include/volk/volk_8ic_s32f_deinterleave_real_32f_a.h
index 5f1430394..74073f5a6 100644
--- a/volk/include/volk/volk_8ic_s32f_deinterleave_real_32f_a16.h
+++ b/volk/include/volk/volk_8ic_s32f_deinterleave_real_32f_a.h
@@ -1,10 +1,11 @@
-#ifndef INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a16_H
-#define INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a16_H
+#ifndef INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a_H
+#define INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a_H
 
+#include <volk/volk_common.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I float vector data
@@ -13,7 +14,7 @@
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_real_32f_a_sse4_1(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
 
   unsigned int number = 0;
@@ -61,7 +62,7 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffer
 #endif /* LV_HAVE_SSE4_1 */
 
 
-#if LV_HAVE_SSE
+#ifdef LV_HAVE_SSE
 #include <xmmintrin.h>
 /*!
   \brief Deinterleaves the complex 8 bit vector into I float vector data
@@ -70,7 +71,7 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse4_1(float* iBuffer
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_real_32f_a_sse(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   float* iBufferPtr = iBuffer;
 
   unsigned int number = 0;
@@ -81,7 +82,7 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer, c
   __m128 invScalar = _mm_set_ps1(iScalar);
   int8_t* complexVectorPtr = (int8_t*)complexVector;
 
-  float floatBuffer[4] __attribute__((aligned(128)));
+  __VOLK_ATTR_ALIGNED(16) float floatBuffer[4];
 
   for(;number < quarterPoints; number++){
     floatBuffer[0] = (float)(*complexVectorPtr); complexVectorPtr += 2;
@@ -107,7 +108,7 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer, c
 }
 #endif /* LV_HAVE_SSE */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Deinterleaves the complex 8 bit vector into I float vector data
   \param complexVector The complex input vector
@@ -115,7 +116,7 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_sse(float* iBuffer, c
   \param scalar The scaling value being multiplied against each data point
   \param num_points The number of complex data values to be deinterleaved
 */
-static inline void volk_8ic_s32f_deinterleave_real_32f_a16_generic(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_s32f_deinterleave_real_32f_a_generic(float* iBuffer, const lv_8sc_t* complexVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const int8_t* complexVectorPtr = (const int8_t*)complexVector;
   float* iBufferPtr = iBuffer;
@@ -130,4 +131,4 @@ static inline void volk_8ic_s32f_deinterleave_real_32f_a16_generic(float* iBuffe
 
 
 
-#endif /* INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a16_H */
+#endif /* INCLUDED_volk_8ic_s32f_deinterleave_real_32f_a_H */
diff --git a/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a16.h b/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h
index d9cacbf46..0bb76f1d1 100644
--- a/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a16.h
+++ b/volk/include/volk/volk_8ic_x2_multiply_conjugate_16ic_a.h
@@ -1,11 +1,11 @@
-#ifndef INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a16_H
-#define INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a16_H
+#ifndef INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a_H
+#define INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <volk/volk_complex.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Multiplys the one complex vector with the complex conjugate of the second complex vector and stores their results in the third vector
@@ -14,7 +14,7 @@
   \param bVector The complex vector which will be converted to complex conjugate and multiplied
   \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points){
+static inline void volk_8ic_x2_multiply_conjugate_16ic_a_sse4_1(lv_16sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -23,7 +23,6 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVe
   const lv_8sc_t* a = aVector;
   const lv_8sc_t* b = bVector;
   __m128i conjugateSign = _mm_set_epi16(-1, 1, -1, 1, -1, 1, -1, 1);
-  const int shuffleMask = _MM_SHUFFLE(2,3,0,1);
     
   for(;number < quarterPoints; number++){
     // Convert into 8 bit values into 16 bit values
@@ -37,7 +36,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVe
     y = _mm_sign_epi16(y, conjugateSign);
 
     // Shift the order of the cr and ci values
-    y = _mm_shufflehi_epi16(_mm_shufflelo_epi16(y, shuffleMask ), shuffleMask);
+    y = _mm_shufflehi_epi16(_mm_shufflelo_epi16(y, _MM_SHUFFLE(2,3,0,1) ), _MM_SHUFFLE(2,3,0,1));
 
     // Calculate the ar*(-ci) + cr*(ai)
     imagz = _mm_madd_epi16(x,y);
@@ -56,10 +55,10 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVe
   for(; number < num_points; number++){
     float aReal =  (float)*a8Ptr++;
     float aImag =  (float)*a8Ptr++;
-    lv_32fc_t aVal = lv_32fc_init(aReal, aImag );
+    lv_32fc_t aVal = lv_cmake(aReal, aImag );
     float bReal = (float)*b8Ptr++;
     float bImag = (float)*b8Ptr++;
-    lv_32fc_t bVal = lv_32fc_init( bReal, -bImag );
+    lv_32fc_t bVal = lv_cmake( bReal, -bImag );
     lv_32fc_t temp = aVal * bVal;
 
     *c16Ptr++ = (int16_t)lv_creal(temp);
@@ -68,7 +67,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVe
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Multiplys the one complex vector with the complex conjugate of the second complex vector and stores their results in the third vector
   \param cVector The complex vector where the results will be stored
@@ -76,7 +75,7 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_sse4_1(lv_16sc_t* cVe
   \param bVector The complex vector which will be converted to complex conjugate and multiplied
   \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_generic(lv_16sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points){
+static inline void volk_8ic_x2_multiply_conjugate_16ic_a_generic(lv_16sc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, unsigned int num_points){
   unsigned int number = 0;
   int16_t* c16Ptr = (int16_t*)cVector;
   int8_t* a8Ptr = (int8_t*)aVector;
@@ -84,10 +83,10 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_generic(lv_16sc_t* cV
   for(number =0; number < num_points; number++){
     float aReal =  (float)*a8Ptr++;
     float aImag =  (float)*a8Ptr++;
-    lv_32fc_t aVal = lv_32fc_init(aReal, aImag );
+    lv_32fc_t aVal = lv_cmake(aReal, aImag );
     float bReal = (float)*b8Ptr++;
     float bImag = (float)*b8Ptr++;
-    lv_32fc_t bVal = lv_32fc_init( bReal, -bImag );
+    lv_32fc_t bVal = lv_cmake( bReal, -bImag );
     lv_32fc_t temp = aVal * bVal;
 
     *c16Ptr++ = (int16_t)lv_creal(temp);
@@ -99,4 +98,4 @@ static inline void volk_8ic_x2_multiply_conjugate_16ic_a16_generic(lv_16sc_t* cV
 
 
 
-#endif /* INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a16_H */
+#endif /* INCLUDED_volk_8ic_x2_multiply_conjugate_16ic_a_H */
diff --git a/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a16.h b/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h
index 6ec923a4f..3e05608a4 100644
--- a/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a16.h
+++ b/volk/include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc_a.h
@@ -1,11 +1,11 @@
-#ifndef INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_H
-#define INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_H
+#ifndef INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a_H
+#define INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a_H
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <volk/volk_complex.h>
 
-#if LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1
 #include <smmintrin.h>
 /*!
   \brief Multiplys the one complex vector with the complex conjugate of the second complex vector and stores their results in the third vector
@@ -14,7 +14,7 @@
   \param bVector The complex vector which will be converted to complex conjugate and multiplied
   \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a_sse4_1(lv_32fc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   const unsigned int quarterPoints = num_points / 4;
 
@@ -24,7 +24,7 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t
   const lv_8sc_t* a = aVector;
   const lv_8sc_t* b = bVector;
   __m128i conjugateSign = _mm_set_epi16(-1, 1, -1, 1, -1, 1, -1, 1);
-  const int shuffleMask = _MM_SHUFFLE(2,3,0,1);
+
   __m128 invScalar = _mm_set_ps1(1.0/scalar);
 
   for(;number < quarterPoints; number++){
@@ -39,7 +39,7 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t
     y = _mm_sign_epi16(y, conjugateSign);
 
     // Shift the order of the cr and ci values
-    y = _mm_shufflehi_epi16(_mm_shufflelo_epi16(y, shuffleMask ), shuffleMask);
+    y = _mm_shufflehi_epi16(_mm_shufflelo_epi16(y, _MM_SHUFFLE(2,3,0,1) ), _MM_SHUFFLE(2,3,0,1));
 
     // Calculate the ar*(-ci) + cr*(ai)
     imagz = _mm_madd_epi16(x,y);
@@ -75,10 +75,10 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t
   for(; number < num_points; number++){
     float aReal =  (float)*a8Ptr++;
     float aImag =  (float)*a8Ptr++;
-    lv_32fc_t aVal = lv_32fc_init(aReal, aImag );
+    lv_32fc_t aVal = lv_cmake(aReal, aImag );
     float bReal = (float)*b8Ptr++;
     float bImag = (float)*b8Ptr++;
-    lv_32fc_t bVal = lv_32fc_init( bReal, -bImag );
+    lv_32fc_t bVal = lv_cmake( bReal, -bImag );
     lv_32fc_t temp = aVal * bVal;
     
     *cFloatPtr++ = lv_creal(temp) / scalar;
@@ -87,7 +87,7 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t
 }
 #endif /* LV_HAVE_SSE4_1 */
 
-#if LV_HAVE_GENERIC
+#ifdef LV_HAVE_GENERIC
 /*!
   \brief Multiplys the one complex vector with the complex conjugate of the second complex vector and stores their results in the third vector
   \param cVector The complex vector where the results will be stored
@@ -95,7 +95,7 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_sse4_1(lv_32fc_t
   \param bVector The complex vector which will be converted to complex conjugate and multiplied
   \param num_points The number of complex values in aVector and bVector to be multiplied together and stored into cVector
 */
-static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_generic(lv_32fc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, const float scalar, unsigned int num_points){
+static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a_generic(lv_32fc_t* cVector, const lv_8sc_t* aVector, const lv_8sc_t* bVector, const float scalar, unsigned int num_points){
   unsigned int number = 0;
   float* cPtr = (float*)cVector;
   const float invScalar = 1.0 / scalar;
@@ -104,10 +104,10 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_generic(lv_32fc_
   for(number = 0; number < num_points; number++){
     float aReal =  (float)*a8Ptr++;
     float aImag =  (float)*a8Ptr++;
-    lv_32fc_t aVal = lv_32fc_init(aReal, aImag );
+    lv_32fc_t aVal = lv_cmake(aReal, aImag );
     float bReal = (float)*b8Ptr++;
     float bImag = (float)*b8Ptr++;
-    lv_32fc_t bVal = lv_32fc_init( bReal, -bImag );
+    lv_32fc_t bVal = lv_cmake( bReal, -bImag );
     lv_32fc_t temp = aVal * bVal;
     
     *cPtr++ = (lv_creal(temp) * invScalar);
@@ -119,4 +119,4 @@ static inline void volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_generic(lv_32fc_
 
 
 
-#endif /* INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a16_H */
+#endif /* INCLUDED_volk_8ic_x2_s32f_multiply_conjugate_32fc_a_H */
diff --git a/volk/include/volk/volk_common.h b/volk/include/volk/volk_common.h
index 6f444ad89..2c935d1fb 100644
--- a/volk/include/volk/volk_common.h
+++ b/volk/include/volk/volk_common.h
@@ -1,18 +1,94 @@
-#ifndef INCLUDED_LIBVECTOR_COMMON_H
-#define INCLUDED_LIBVECTOR_COMMON_H
+#ifndef INCLUDED_LIBVOLK_COMMON_H
+#define INCLUDED_LIBVOLK_COMMON_H
+
+////////////////////////////////////////////////////////////////////////
+// Cross-platform attribute macros
+////////////////////////////////////////////////////////////////////////
+#if defined __GNUC__
+#  define __VOLK_ATTR_ALIGNED(x) __attribute__((aligned(x)))
+#  define __VOLK_ATTR_UNUSED     __attribute__((unused))
+#  define __VOLK_ATTR_INLINE     __attribute__((always_inline))
+#  define __VOLK_ATTR_DEPRECATED __attribute__((deprecated))
+#  if __GNUC__ >= 4
+#    define __VOLK_ATTR_EXPORT   __attribute__((visibility("default")))
+#    define __VOLK_ATTR_IMPORT   __attribute__((visibility("default")))
+#  else
+#    define __VOLK_ATTR_EXPORT
+#    define __VOLK_ATTR_IMPORT
+#  endif
+#elif _MSC_VER
+#  define __VOLK_ATTR_ALIGNED(x) __declspec(align(x))
+#  define __VOLK_ATTR_UNUSED
+#  define __VOLK_ATTR_INLINE     __forceinline
+#  define __VOLK_ATTR_DEPRECATED __declspec(deprecated)
+#  define __VOLK_ATTR_EXPORT     __declspec(dllexport)
+#  define __VOLK_ATTR_IMPORT     __declspec(dllimport)
+#else
+#  define __VOLK_ATTR_ALIGNED(x)
+#  define __VOLK_ATTR_UNUSED
+#  define __VOLK_ATTR_INLINE
+#  define __VOLK_ATTR_DEPRECATED
+#  define __VOLK_ATTR_EXPORT
+#  define __VOLK_ATTR_IMPORT
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// Ignore annoying warnings in MSVC
+////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER)
+#  pragma warning(disable: 4244) //'conversion' conversion from 'type1' to 'type2', possible loss of data
+#  pragma warning(disable: 4305) //'identifier' : truncation from 'type1' to 'type2'
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// C-linkage declaration macros
+// FIXME: due to the usage of complex.h, require gcc for c-linkage
+////////////////////////////////////////////////////////////////////////
+#if defined(__cplusplus) && (__GNUC__)
+#  define __VOLK_DECL_BEGIN extern "C" {
+#  define __VOLK_DECL_END }
+#else
+#  define __VOLK_DECL_BEGIN
+#  define __VOLK_DECL_END
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// Define VOLK_API for library symbols
+// http://gcc.gnu.org/wiki/Visibility
+////////////////////////////////////////////////////////////////////////
+#ifdef volk_EXPORTS
+#  define VOLK_API __VOLK_ATTR_EXPORT
+#else
+#  define VOLK_API __VOLK_ATTR_IMPORT
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// The bit128 union used by some
+////////////////////////////////////////////////////////////////////////
+#include <inttypes.h>
+
+#ifdef LV_HAVE_SSE
+#include <xmmintrin.h>
+#endif
+
+#ifdef LV_HAVE_SSE2
+#include <emmintrin.h>
+#endif
 
-#include<inttypes.h>
-#if LV_HAVE_MMX
-#include<xmmintrin.h>
 union bit128{
   uint16_t i16[8];
   uint32_t i[4];
   float f[4];
   double d[2];
-  __m128i int_vec;
+
+  #ifdef LV_HAVE_SSE
   __m128 float_vec;
+  #endif
+
+  #ifdef LV_HAVE_SSE2
+  __m128i int_vec;
   __m128d double_vec;
+  #endif
 };
-#endif /*LV_HAVE_MMX*/
 
-#endif /*INCLUDED_LIBVECTOR_COMMON_H*/
+#endif /*INCLUDED_LIBVOLK_COMMON_H*/
diff --git a/volk/include/volk/volk_complex.h b/volk/include/volk/volk_complex.h
index f2fd17342..5bd925044 100644
--- a/volk/include/volk/volk_complex.h
+++ b/volk/include/volk/volk_complex.h
@@ -2,8 +2,21 @@
 #define INCLUDE_VOLK_COMPLEX_H
 
 /*!
-  \brief This header file is to prevent issues with having "complex" and "complex.h" variables in the same code as the gcc compiler does not allow that
-*/
+ * \brief Provide typedefs and operators for all complex types in C and C++.
+ *
+ * The typedefs encompass all signed integer and floating point types.
+ * Each operator function is intended to work across all data types.
+ * Under C++, these operators are defined as inline templates.
+ * Under C, these operators are defined as preprocessor macros.
+ * The use of macros makes the operators agnostic to the type.
+ *
+ * The following operator functions are defined:
+ * - lv_cmake - make a complex type from components
+ * - lv_creal - get the real part of the complex number
+ * - lv_cimag - get the imaginary part of the complex number
+ * - lv_conj - take the conjugate of the complex number
+ */
+
 #ifdef __cplusplus
 
 #include <complex>
@@ -12,60 +25,62 @@
 typedef std::complex<int8_t>  lv_8sc_t;
 typedef std::complex<int16_t> lv_16sc_t;
 typedef std::complex<int32_t> lv_32sc_t;
+typedef std::complex<int64_t> lv_64sc_t;
 typedef std::complex<float>   lv_32fc_t;
 typedef std::complex<double>  lv_64fc_t;
 
-static inline float lv_creal(const lv_32fc_t x){
-  return x.real();
-}
-
-static inline float lv_cimag(const lv_32fc_t x){
-  return x.imag();
+template <typename T> inline std::complex<T> lv_cmake(const T &r, const T &i){
+    return std::complex<T>(r, i);
 }
 
-static inline lv_32fc_t lv_conj(const lv_32fc_t x){
-  return std::conj(x);
+template <typename T> inline typename T::value_type lv_creal(const T &x){
+    return x.real();
 }
 
-static inline lv_32fc_t lv_cpow(const lv_32fc_t x, const lv_32fc_t y){
-  return std::pow(x, y);
+template <typename T> inline typename T::value_type lv_cimag(const T &x){
+    return x.imag();
 }
 
-static inline lv_32fc_t lv_32fc_init(const float x, const float y){
-  return std::complex<float>(x,y);
+template <typename T> inline T lv_conj(const T &x){
+    return std::conj(x);
 }
 
-#else
+#else /* __cplusplus */
 
 #include <complex.h>
 
 typedef char complex         lv_8sc_t;
 typedef short complex        lv_16sc_t;
-typedef int complex          lv_32sc_t;
+typedef long complex         lv_32sc_t;
+typedef long long complex    lv_64sc_t;
 typedef float complex        lv_32fc_t;
 typedef double complex       lv_64fc_t;
 
-static inline float lv_creal(const lv_32fc_t x){
-  return creal(x);
-}
+#define lv_cmake(r, i) ((r) + _Complex_I*(i))
 
-static inline float lv_cimag(const lv_32fc_t x){
-  return cimag(x);
-}
+// When GNUC is available, use the complex extensions.
+// The extensions always return the correct value type.
+// http://gcc.gnu.org/onlinedocs/gcc/Complex.html
+#ifdef __GNUC__
 
-static inline lv_32fc_t lv_conj(const lv_32fc_t x){
-  return conj(x);
-}
+#define lv_creal(x) (__real__(x))
 
-static inline lv_32fc_t lv_cpow(const lv_32fc_t x, const lv_32fc_t y){
-  return cpow(x, y);
-}
+#define lv_cimag(x) (__imag__(x))
 
-static inline lv_32fc_t lv_32fc_init(const float x, const float y){
-  return x + I*y;
-}
+#define lv_conj(x) (~(x))
+
+// When not available, use the c99 complex function family,
+// which always returns double regardless of the input type.
+#else /* __GNUC__ */
+
+#define lv_creal(x) (creal(x))
+
+#define lv_cimag(x) (cimag(x))
+
+#define lv_conj(x) (conj(x))
 
-#endif
+#endif /* __GNUC__ */
 
+#endif /* __cplusplus */
 
 #endif /* INCLUDE_VOLK_COMPLEX_H */
diff --git a/volk/include/volk/volk_prefs.h b/volk/include/volk/volk_prefs.h
new file mode 100644
index 000000000..2a7f7e79f
--- /dev/null
+++ b/volk/include/volk/volk_prefs.h
@@ -0,0 +1,25 @@
+#ifndef INCLUDED_VOLK_PREFS_H
+#define INCLUDED_VOLK_PREFS_H
+
+#include <volk/volk_common.h>
+
+__VOLK_DECL_BEGIN
+
+struct VOLK_API volk_arch_pref {
+    char name[128];
+    char arch[32];
+};
+
+////////////////////////////////////////////////////////////////////////
+// get path to volk_config profiling info
+////////////////////////////////////////////////////////////////////////
+VOLK_API void get_config_path(char *);
+
+////////////////////////////////////////////////////////////////////////
+// load prefs into global prefs struct
+////////////////////////////////////////////////////////////////////////
+VOLK_API int load_preferences(struct volk_arch_pref **);
+
+__VOLK_DECL_END
+
+#endif //INCLUDED_VOLK_PREFS_H
diff --git a/volk/lib/.gitignore b/volk/lib/.gitignore
index 6a5fde28f..28ec6ddaa 100644
--- a/volk/lib/.gitignore
+++ b/volk/lib/.gitignore
@@ -1,23 +1,4 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
 /Makefile
 /Makefile.in
-/volk.c
-/volk_cpu_generic.c
-/volk_cpu_powerpc.c
-/volk_cpu_x86.c
-/volk_environment_init.c
-/volk_init.c
-/volk_init.h
-/volk_mktables
-/volk_mktables.c
-/volk_proccpu_sim.c
-/volk_runtime.c
-/test_all
+/Makefile.am
 /testqa
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
new file mode 100644
index 000000000..33a478265
--- /dev/null
+++ b/volk/lib/CMakeLists.txt
@@ -0,0 +1,261 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# Parse the arches xml file:
+#  Test each arch to see if the compiler supports the flag.
+#  If the test passes append the arch to the available list.
+########################################################################
+#extract the arch lines from the xml file using crazy python
+EXECUTE_PROCESS(
+    COMMAND ${PYTHON_EXECUTABLE} -c
+    "from xml.dom import minidom; print ';'.join(map(lambda a: '%s %s'%(a.attributes['name'].value,a.getElementsByTagName('flag')[0].firstChild.data),minidom.parse('${CMAKE_SOURCE_DIR}/gen/archs.xml').getElementsByTagName('arch')))"
+    OUTPUT_VARIABLE arch_lines OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+#This macro sets the ${arch}_flag variable,
+#and handles special cases for MSVC arch flags.
+MACRO(set_arch_flag name flag)
+    IF(MSVC AND ${name} STREQUAL "mmx")
+        SET(${name}_flag "/arch:SSE") #no /arch:MMX
+    ELSEIF(MSVC AND ${name} STREQUAL "sse")
+        SET(${name}_flag "/arch:SSE")
+    ELSEIF(MSVC AND ${name} STREQUAL "sse2")
+        SET(${name}_flag "/arch:SSE2")
+    ELSE()
+        SET(${name}_flag -${flag})
+    ENDIF()
+ENDMACRO(set_arch_flag)
+
+MACRO(handle_arch name flag)
+
+    #handle special case for none flag
+    IF(${flag} STREQUAL "none")
+        SET(have_${name} TRUE)
+
+    #otherwise test the flag against the compiler
+    ELSE()
+        INCLUDE(CheckCXXCompilerFlag)
+        set_arch_flag(${name} ${flag})
+        CHECK_CXX_COMPILER_FLAG(${${name}_flag} have_${name})
+    ENDIF()
+
+    IF(have_${name})
+        LIST(APPEND available_arches ${name})
+    ENDIF()
+ENDMACRO(handle_arch)
+
+#create a list of available arches
+FOREACH(arch_line ${arch_lines})
+    SEPARATE_ARGUMENTS(args UNIX_COMMAND "${arch_line}")
+    handle_arch(${args})
+ENDFOREACH(arch_line)
+
+MESSAGE(STATUS "Available arches: ${available_arches}")
+
+########################################################################
+# Parse the machines xml file:
+#  Test each machine to see if its arch dependencies are supported.
+#  Build a list of supported machines and the machine definitions.
+########################################################################
+#extract the machine lines from the xml file using crazy python
+EXECUTE_PROCESS(
+    COMMAND ${PYTHON_EXECUTABLE} -c
+    "from xml.dom import minidom; print ';'.join(map(lambda a: '%s %s'%(a.attributes['name'].value,a.getElementsByTagName('archs')[0].firstChild.data),minidom.parse('${CMAKE_SOURCE_DIR}/gen/machines.xml').getElementsByTagName('machine')))"
+    OUTPUT_VARIABLE machine_lines OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+MACRO(handle_machine1 name)
+    UNSET(machine_flags)
+    STRING(TOUPPER LV_MACHINE_${name} machine_def)
+
+    #check if all the arches are supported
+    FOREACH(arch ${ARGN})
+        SET(is_match ${have_${arch}})
+        IF(NOT is_match)
+            SET(is_match FALSE)
+            BREAK()
+        ENDIF(NOT is_match)
+        SET(machine_flags "${machine_flags} ${${arch}_flag}")
+    ENDFOREACH(arch)
+
+    IF(is_match)
+        #this is a match, append the source and set its flags
+        SET(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${name}.c)
+        SET_SOURCE_FILES_PROPERTIES(${machine_source} PROPERTIES COMPILE_FLAGS ${machine_flags})
+        LIST(APPEND machine_sources ${machine_source})
+        LIST(APPEND machine_defs ${machine_def})
+        LIST(APPEND available_machines ${name})
+    ENDIF()
+ENDMACRO(handle_machine1)
+
+MACRO(handle_machine name)
+    SET(arches ${ARGN})
+    LIST(FIND arches "32|64" index)
+    IF(${index} EQUAL -1)
+        handle_machine1(${name} ${arches})
+    ELSE()
+        LIST(REMOVE_ITEM arches "32|64")
+        handle_machine1(${name}_32 32 ${arches})
+        handle_machine1(${name}_64 64 ${arches})
+    ENDIF()
+ENDMACRO(handle_machine)
+
+#setup the available machines
+FOREACH(machine_line ${machine_lines})
+    SEPARATE_ARGUMENTS(args UNIX_COMMAND "${machine_line}")
+    handle_machine(${args})
+ENDFOREACH(machine_line)
+
+MESSAGE(STATUS "Available machines: ${available_machines}")
+
+########################################################################
+# Create rules to run the volk generator
+########################################################################
+#list of the generated sources
+SET(volk_gen_sources
+    ${CMAKE_BINARY_DIR}/include/volk/volk.h
+    ${CMAKE_BINARY_DIR}/lib/volk.c
+    ${CMAKE_BINARY_DIR}/lib/volk_init.h
+    ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h
+    ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h
+    ${CMAKE_BINARY_DIR}/lib/volk_cpu.c
+    ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h
+    ${CMAKE_BINARY_DIR}/lib/volk_environment_init.c
+    ${CMAKE_BINARY_DIR}/lib/volk_environment_init.h
+    ${CMAKE_BINARY_DIR}/lib/volk_machines.h
+    ${CMAKE_BINARY_DIR}/lib/volk_machines.c
+    ${machine_sources}
+)
+
+#dependencies are all python, xml, and header implementation files
+FILE(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
+FILE(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
+FILE(GLOB h_files ${CMAKE_SOURCE_DIR}/include/volk/*.h)
+
+ADD_CUSTOM_COMMAND(
+    OUTPUT ${volk_gen_sources}
+    DEPENDS ${xml_files} ${py_files} ${h_files}
+    COMMAND ${PYTHON_EXECUTABLE} -B
+        ${CMAKE_SOURCE_DIR}/gen/volk_register.py
+        ${CMAKE_BINARY_DIR}
+)
+
+########################################################################
+# Handle orc support
+########################################################################
+FIND_PACKAGE(PkgConfig)
+IF(PKG_CONFIG_FOUND)
+PKG_CHECK_MODULES(ORC "orc-0.4")
+ENDIF(PKG_CONFIG_FOUND)
+
+FIND_PROGRAM(ORCC_EXECUTABLE orcc)
+
+IF(ORC_FOUND AND ORCC_EXECUTABLE)
+    #setup orc library usage
+    INCLUDE_DIRECTORIES(${ORC_INCLUDE_DIRS})
+    LINK_DIRECTORIES(${ORC_LIBRARY_DIRS})
+    ADD_DEFINITIONS(-DLV_HAVE_ORC)
+
+    #setup orc functions
+    FILE(GLOB orc_files ${CMAKE_SOURCE_DIR}/orc/*.orc)
+    FOREACH(orc_file ${orc_files})
+
+        #extract the name for the generated c source from the orc file
+        GET_FILENAME_COMPONENT(orc_file_name_we ${orc_file} NAME_WE)
+        SET(orcc_gen ${CMAKE_CURRENT_BINARY_DIR}/${orc_file_name_we}.c)
+
+        #create a rule to generate the source and add to the list of sources
+        ADD_CUSTOM_COMMAND(
+            COMMAND ${ORCC_EXECUTABLE} --implementation -o ${orcc_gen} ${orc_file}
+            DEPENDS ${orc_file} OUTPUT ${orcc_gen}
+        )
+        LIST(APPEND volk_sources ${orcc_gen})
+
+    ENDFOREACH(orc_file)
+ELSE()
+    MESSAGE(STATUS "Did not find liborc and orcc, disabling orc support...")
+ENDIF()
+
+########################################################################
+# Setup the volk sources list and library
+########################################################################
+IF(NOT WIN32)
+    ADD_DEFINITIONS(-fvisibility=hidden)
+ENDIF()
+
+INCLUDE_DIRECTORIES(
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+LIST(APPEND volk_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/volk_prefs.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/volk_rank_archs.c
+    ${volk_gen_sources}
+)
+
+#set the machine definitions where applicable
+SET_SOURCE_FILES_PROPERTIES(
+    ${CMAKE_CURRENT_BINARY_DIR}/volk.c
+    ${CMAKE_CURRENT_BINARY_DIR}/volk_machines.c
+PROPERTIES COMPILE_DEFINITIONS "${machine_defs}")
+
+IF(MSVC)
+    #add compatibility includes for stdint types
+    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc)
+    #compile the sources as C++ due to the lack of complex.h under MSVC
+    SET_SOURCE_FILES_PROPERTIES(${volk_sources} PROPERTIES LANGUAGE CXX)
+ENDIF(MSVC)
+
+#create the volk runtime library
+ADD_LIBRARY(volk SHARED ${volk_sources})
+TARGET_LINK_LIBRARIES(volk ${ORC_LIBRARIES})
+SET_TARGET_PROPERTIES(volk PROPERTIES SOVERSION ${LIBVER})
+SET_TARGET_PROPERTIES(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
+
+INSTALL(TARGETS volk
+    LIBRARY DESTINATION lib${LIB_SUFFIX} # .so file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
+    RUNTIME DESTINATION bin # .dll file
+)
+
+########################################################################
+# Build the QA test application
+########################################################################
+FIND_PACKAGE(Boost COMPONENTS unit_test_framework)
+
+IF(Boost_FOUND)
+
+SET_SOURCE_FILES_PROPERTIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
+    COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
+)
+
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+ADD_EXECUTABLE(test_all
+    ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
+)
+TARGET_LINK_LIBRARIES(test_all volk ${Boost_LIBRARIES})
+ADD_TEST(qa_volk_test_all test_all)
+
+ENDIF()
diff --git a/volk/lib/Makefile.am b/volk/lib/Makefile.am
deleted file mode 100644
index 473acd2a6..000000000
--- a/volk/lib/Makefile.am
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# Copyright 2010,2011 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-#FIXME: forcing the top_builddir for distcheck seems like a bit
-# of a hack. Figure out the right way to do this to find built
-# volk_config.h and volk_tables.h
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
-	-I$(top_builddir)/include \
-	$(LV_CXXFLAGS) $(WITH_INCLUDES)
-
-
-# We build 1 library and 1 executable here.  The library contains
-# everything except the QA code. The C++ QA code is especially recommended
-# when you have general purpose C or C++ code that may not get
-# thoroughly exercised by building and running a GR block.  The
-# executable runs the QA code at "make check" time.
-#
-#
-#
-# N.B., If there's a SWIG generated shared library and associated
-# python code, it will be contained in ../python, not here.  (That
-# code is conditionally built depending on the state of the
-# --without-python configure option.)  However, the .i should be here
-# next to the .h that it's based on.
-
-
-# list of programs run by "make check" and "make distcheck"
-#TESTS = testqa
-#orc stuff gets built in the ORC directory conditional to ORC being enabled.
-#it gets linked in during the build of libvolk as an added library.
-#there might be a better way to do this.
-
-lib_LTLIBRARIES = \
-	libvolk.la \
-	libvolk_runtime.la
-
-EXTRA_DIST = \
-	volk_mktables.c		\
-	volk_rank_archs.h 	\
-	volk_proccpu_sim.c	\
-	gcc_x86_cpuid.h
-
-# ----------------------------------------------------------------
-#                      The main library
-# ----------------------------------------------------------------
-
-libvolk_runtime_la_SOURCES = 	\
-	$(platform_CODE) 	\
-	volk_runtime.c		\
-	volk_init.c 		\
-	volk_rank_archs.c	
-
-libvolk_la_SOURCES = 		\
-	$(platform_CODE) 	\
-	volk.c 			\
-	volk_environment_init.c
-
-volk_orc_LDFLAGS = \
-	$(ORC_LDFLAGS) \
-	-lorc-0.4
-
-volk_orc_LIBADD = \
-	../orc/libvolk_orc.la
-
-if LV_HAVE_ORC
-libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS)
-libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS)
-libvolk_la_LIBADD = $(volk_orc_LIBADD)
-else
-libvolk_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-libvolk_runtime_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-libvolk_la_LIBADD =
-endif
-
-
-# ----------------------------------------------------------------
-#        The QA library.  Note libvolk.la in LIBADD
-# ----------------------------------------------------------------
-#libvolk_qa_la_SOURCES = \
-#	qa_utils.cc
-
-#libvolk_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -lboost
-
-#libvolk_qa_la_LIBADD = \
-#	libvolk.la \
-#	libvolk_runtime.la
-
-# ----------------------------------------------------------------
-# headers that don't get installed
-# ----------------------------------------------------------------
-noinst_HEADERS = \
-	volk_init.h \
-	qa_utils.h
-
-# ----------------------------------------------------------------
-# Our test program
-# ----------------------------------------------------------------
-noinst_PROGRAMS = \
-	testqa
-
-testqa_SOURCES = testqa.cc qa_utils.cc
-testqa_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN $(AM_CPPFLAGS) \
-			$(BOOST_CPPFLAGS)
-testqa_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-if LV_HAVE_ORC
-testqa_LDADD  = \
-	libvolk.la \
-	libvolk_runtime.la \
-	../orc/libvolk_orc.la
-else 
-testqa_LDADD  = \
-	libvolk.la \
-	libvolk_runtime.la
-endif
-
-distclean-local: 
-	rm -f volk.c
-	rm -f volk_cpu_generic.c
-	rm -f volk_cpu_powerpc.c
-	rm -f volk_cpu_x86.c
-	rm -f volk_init.c
-	rm -f volk_init.h
-	rm -f volk_mktables.c
-	rm -f volk_proccpu_sim.c
-	rm -f volk_runtime.c
-	rm -f volk_tables.h
-	rm -f volk_environment_init.c
-#SUBDIRS = 
-
-#ifdef BUILD_SSE
-#SUBDIRS += sse
-#elif BUILD_SPU
-#SUBDIRS += spu
-#else
-#SUBDIRS += port
-#endif
-
-
diff --git a/volk/lib/qa_16s_add_quad_aligned16.cc b/volk/lib/qa_16s_add_quad_aligned16.cc
index 154aa0f17..5d5eb7e18 100644
--- a/volk/lib/qa_16s_add_quad_aligned16.cc
+++ b/volk/lib/qa_16s_add_quad_aligned16.cc
@@ -22,20 +22,20 @@ void qa_16s_add_quad_aligned16::t1() {
   double total;
   const int vlen = 3200;
   const int ITERS = 100000;
-  short input0[vlen] __attribute__ ((aligned (16)));
-  short input1[vlen] __attribute__ ((aligned (16)));
-  short input2[vlen] __attribute__ ((aligned (16)));
-  short input3[vlen] __attribute__ ((aligned (16)));
-  short input4[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short input0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input4[vlen];
   
-  short output0[vlen] __attribute__ ((aligned (16)));
-  short output1[vlen] __attribute__ ((aligned (16)));
-  short output2[vlen] __attribute__ ((aligned (16)));
-  short output3[vlen] __attribute__ ((aligned (16)));
-  short output01[vlen] __attribute__ ((aligned (16)));
-  short output11[vlen] __attribute__ ((aligned (16)));
-  short output21[vlen] __attribute__ ((aligned (16)));
-  short output31[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output01[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output11[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output21[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output31[vlen];
 
   for(int i = 0; i < vlen; ++i) {
     short plus0 = ((short) (rand() - (RAND_MAX/2))) >> 2;
diff --git a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
index 62deffaeb..2e6e6a1a0 100644
--- a/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
+++ b/volk/lib/qa_16s_branch_4_state_8_aligned16.cc
@@ -29,22 +29,22 @@ void qa_16s_branch_4_state_8_aligned16::t1() {
   clock_t start, end;
   double total;
   
-  short target[vlen] __attribute__ ((aligned (16)));
-  short target2[vlen] __attribute__ ((aligned (16)));
-  short target3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short target[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target3[vlen];
   
-  short src0[vlen] __attribute__ ((aligned (16)));
-  short permute_indexes[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short src0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short permute_indexes[vlen] =  {
 7, 5, 2, 0, 6, 4, 3, 1, 6, 4, 3, 1, 7, 5, 2, 0, 1, 3, 4, 6, 0, 2, 5, 7, 0, 2, 5, 7, 1, 3, 4, 6 };
-  short cntl0[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl0[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl1[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl1[vlen] = {
     0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-  short cntl2[vlen] __attribute__ ((aligned (16))) = {
+  __VOLK_ATTR_ALIGNED(16) short cntl2[vlen] = {
     0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000 };
-  short cntl3[vlen] __attribute__ ((aligned (16))) =  {
+  __VOLK_ATTR_ALIGNED(16) short cntl3[vlen] =  {
     0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff };
-  short scalars[4] __attribute__ ((aligned (16))) = {1, 2, 3, 4};
+  __VOLK_ATTR_ALIGNED(16) short scalars[4] = {1, 2, 3, 4};
   
   
 
diff --git a/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc b/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
index 819b2256b..3cd4e906d 100644
--- a/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
+++ b/volk/lib/qa_16s_permute_and_scalar_add_aligned16.cc
@@ -23,15 +23,15 @@ void qa_16s_permute_and_scalar_add_aligned16::t1() {
   clock_t start, end;
   double total;
   
-  short target[vlen] __attribute__ ((aligned (16)));
-  short target2[vlen] __attribute__ ((aligned (16)));
-  short src0[vlen] __attribute__ ((aligned (16)));
-  short permute_indexes[vlen] __attribute__ ((aligned (16)));
-  short cntl0[vlen] __attribute__ ((aligned (16)));
-  short cntl1[vlen] __attribute__ ((aligned (16)));
-  short cntl2[vlen] __attribute__ ((aligned (16)));
-  short cntl3[vlen] __attribute__ ((aligned (16)));
-  short scalars[4] __attribute__ ((aligned (16))) = {1, 2, 3, 4};
+  __VOLK_ATTR_ALIGNED(16) short target[vlen];
+  __VOLK_ATTR_ALIGNED(16) short target2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short src0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short permute_indexes[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short cntl3[vlen];
+  __VOLK_ATTR_ALIGNED(16) short scalars[4] = {1, 2, 3, 4};
 
   for(int i = 0; i < vlen; ++i) {
     src0[i] = i;
diff --git a/volk/lib/qa_16s_quad_max_star_aligned16.cc b/volk/lib/qa_16s_quad_max_star_aligned16.cc
index 66f8c9afa..192a69e35 100644
--- a/volk/lib/qa_16s_quad_max_star_aligned16.cc
+++ b/volk/lib/qa_16s_quad_max_star_aligned16.cc
@@ -17,13 +17,13 @@ void qa_16s_quad_max_star_aligned16::t1() {
 void qa_16s_quad_max_star_aligned16::t1() {
   const int vlen = 34;
   
-  short input0[vlen] __attribute__ ((aligned (16)));
-  short input1[vlen] __attribute__ ((aligned (16)));
-  short input2[vlen] __attribute__ ((aligned (16)));
-  short input3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short input0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input1[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input2[vlen];
+  __VOLK_ATTR_ALIGNED(16) short input3[vlen];
 
-  short output0[vlen] __attribute__ ((aligned (16)));
-  short output1[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) short output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) short output1[vlen];
 
   for(int i = 0; i < vlen; ++i) {
     short plus0 = (short) (rand() - (RAND_MAX/2));
diff --git a/volk/lib/qa_32f_fm_detect_aligned16.cc b/volk/lib/qa_32f_fm_detect_aligned16.cc
index 592304f83..a2e7a85be 100644
--- a/volk/lib/qa_32f_fm_detect_aligned16.cc
+++ b/volk/lib/qa_32f_fm_detect_aligned16.cc
@@ -21,10 +21,10 @@ void qa_32f_fm_detect_aligned16::t1() {
   double total;
   const int vlen = 3201;
   const int ITERS = 10000;
-  float input0[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float input0[vlen];
   
-  float output0[vlen] __attribute__ ((aligned (16)));
-  float output01[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float output0[vlen];
+  __VOLK_ATTR_ALIGNED(16) float output01[vlen];
 
   for(int i = 0; i < vlen; ++i) {   
     input0[i] = ((float) (rand() - (RAND_MAX/2))) / static_cast<float>((RAND_MAX/2));
diff --git a/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc b/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
index a3d0955bd..981bb19e6 100644
--- a/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
+++ b/volk/lib/qa_32fc_power_spectral_density_32f_aligned16.cc
@@ -21,10 +21,10 @@ void qa_32fc_power_spectral_density_32f_aligned16::t1() {
   double total;
   const int vlen = 3201;
   const int ITERS = 10000;
-  std::complex<float> input0[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) std::complex<float> input0[vlen];
   
-  float output_generic[vlen] __attribute__ ((aligned (16)));
-  float output_sse3[vlen] __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) float output_generic[vlen];
+  __VOLK_ATTR_ALIGNED(16) float output_sse3[vlen];
 
   const float scalar = vlen;
   const float rbw = 1.7;
diff --git a/volk/lib/qa_32u_popcnt_aligned16.cc b/volk/lib/qa_32u_popcnt_aligned16.cc
index 618a82a02..c880260f2 100644
--- a/volk/lib/qa_32u_popcnt_aligned16.cc
+++ b/volk/lib/qa_32u_popcnt_aligned16.cc
@@ -25,10 +25,10 @@ void qa_32u_popcnt_aligned16::t1() {
   double total;
 
   const int ITERS = 10000000;
-  uint32_t input0 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint32_t input0;
   
-  uint32_t output0 __attribute__ ((aligned (16)));
-  uint32_t output01 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint32_t output0;
+  __VOLK_ATTR_ALIGNED(16) uint32_t output01;
 
     input0 = ((uint32_t) (rand() - (RAND_MAX/2)));
     output0 = 0;
diff --git a/volk/lib/qa_64u_popcnt_aligned16.cc b/volk/lib/qa_64u_popcnt_aligned16.cc
index 85ef58795..6be4e50ea 100644
--- a/volk/lib/qa_64u_popcnt_aligned16.cc
+++ b/volk/lib/qa_64u_popcnt_aligned16.cc
@@ -25,10 +25,10 @@ void qa_64u_popcnt_aligned16::t1() {
   double total;
 
   const int ITERS = 10000000;
-  uint64_t input0 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint64_t input0;
   
-  uint64_t output0 __attribute__ ((aligned (16)));
-  uint64_t output01 __attribute__ ((aligned (16)));
+  __VOLK_ATTR_ALIGNED(16) uint64_t output0;
+  __VOLK_ATTR_ALIGNED(16) uint64_t output01;
 
     input0 = ((uint64_t) (rand() - (RAND_MAX/2)));
     output0 = 0;
diff --git a/volk/lib/qa_utils.cc b/volk/lib/qa_utils.cc
index b0f63d2b5..7f86dd78b 100644
--- a/volk/lib/qa_utils.cc
+++ b/volk/lib/qa_utils.cc
@@ -3,16 +3,16 @@
 #include <boost/foreach.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/tokenizer.hpp>
-//#include <boost/test/unit_test.hpp>
 #include <iostream>
 #include <vector>
 #include <list>
 #include <ctime>
 #include <cmath>
+#include <limits>
 #include <boost/lexical_cast.hpp>
-//#include <volk/volk_runtime.h>
-#include <volk/volk_registry.h>
 #include <volk/volk.h>
+#include <volk/volk_cpu.h>
+#include <volk/volk_common.h>
 #include <boost/typeof/typeof.hpp>
 #include <boost/type_traits.hpp>
 
@@ -62,50 +62,14 @@ void load_random_data(void *data, volk_type_t type, unsigned int n) {
     }
 }
 
-static std::vector<std::string> get_arch_list(const int archs[]) {
+static std::vector<std::string> get_arch_list(struct volk_func_desc desc) {
     std::vector<std::string> archlist;
-    int num_archs = archs[0];
-    
-    //there has got to be a way to query these arches
-    for(int i = 0; i < num_archs; i++) {
-        switch(archs[i+1]) {
-        case (1<<LV_GENERIC):
-            archlist.push_back("generic");
-            break;
-        case (1<<LV_ORC):
-            archlist.push_back("orc");
-            break;
-        case (1<<LV_SSE):
-            archlist.push_back("sse");
-            break;
-        case (1<<LV_SSE2):
-            archlist.push_back("sse2");
-            break;
-        case (1<<LV_SSE3):
-            archlist.push_back("sse3");
-            break;
-        case (1<<LV_SSSE3):
-            archlist.push_back("ssse3");
-            break;
-        case (1<<LV_SSE4_1):
-            archlist.push_back("sse4_1");
-            break;
-        case (1<<LV_SSE4_2):
-            archlist.push_back("sse4_2");
-            break;
-        case (1<<LV_SSE4_A):
-            archlist.push_back("sse4_a");
-            break;
-        case (1<<LV_MMX):
-            archlist.push_back("mmx");
-            break;
-        case (1<<LV_AVX):
-            archlist.push_back("avx");
-            break;
-        default:
-            break;
-        }
+
+    for(int i = 0; i < desc.n_archs; i++) {
+        //if(!(archs[i+1] & volk_get_lvarch())) continue; //this arch isn't available on this pc
+        archlist.push_back(std::string(desc.indices[i]));
     }
+    
     return archlist;
 }
 
@@ -256,7 +220,7 @@ bool icompare(t *in1, t *in2, unsigned int vlen, unsigned int tol) {
     bool fail = false;
     int print_max_errs = 10;
     for(int i=0; i<vlen; i++) {
-        if(abs(((t *)(in1))[i] - ((t *)(in2))[i]) > tol) {
+        if(abs(int(((t *)(in1))[i]) - int(((t *)(in2))[i])) > tol) {
             fail=true;
             if(print_max_errs-- > 0) {
                 std::cout << "offset " << i << " in1: " << static_cast<int>(t(((t *)(in1))[i])) << " in2: " << static_cast<int>(t(((t *)(in2))[i])) << std::endl;
@@ -269,7 +233,8 @@ bool icompare(t *in1, t *in2, unsigned int vlen, unsigned int tol) {
 
 class volk_qa_aligned_mem_pool{
 public:
-    void *get_new(size_t size, size_t alignment = 16){
+    void *get_new(size_t size){
+        size_t alignment = volk_get_alignment();
         _mems.push_back(std::vector<char>(size + alignment-1, 0));
         size_t ptr = size_t(&_mems.back().front());
         return (void *)((ptr + alignment-1) & ~(alignment-1));
@@ -277,11 +242,19 @@ public:
 private: std::list<std::vector<char> > _mems;
 };
 
-bool run_volk_tests(const int archs[], void (*manual_func)(), std::string name, float tol, float scalar, int vlen, int iter) {
+bool run_volk_tests(struct volk_func_desc desc,
+                    void (*manual_func)(),
+                    std::string name,
+                    float tol,
+                    float scalar,
+                    int vlen,
+                    int iter,
+                    std::vector<std::string> *best_arch_vector = 0
+                   ) {
     std::cout << "RUN_VOLK_TESTS: " << name << std::endl;
     
     //first let's get a list of available architectures for the test
-    std::vector<std::string> arch_list = get_arch_list(archs);
+    std::vector<std::string> arch_list = get_arch_list(desc);
     
     if(arch_list.size() < 2) {
         std::cout << "no architectures to test" << std::endl;
@@ -334,6 +307,7 @@ bool run_volk_tests(const int archs[], void (*manual_func)(), std::string name,
 
     //now run the test
     clock_t start, end;
+    std::vector<double> profile_times;
     for(int i = 0; i < arch_list.size(); i++) {
         start = clock();
 
@@ -368,8 +342,12 @@ bool run_volk_tests(const int archs[], void (*manual_func)(), std::string name,
         }
         
         end = clock();
-        std::cout << arch_list[i] << " completed in " << (double)(end-start)/(double)CLOCKS_PER_SEC << "s" << std::endl;
+        double arch_time = (double)(end-start)/(double)CLOCKS_PER_SEC;
+        std::cout << arch_list[i] << " completed in " << arch_time << "s" << std::endl;
+
+        profile_times.push_back(arch_time);
     }
+    
     //and now compare each output to the generic output
     //first we have to know which output is the generic one, they aren't in order...
     int generic_offset=0;
@@ -381,7 +359,9 @@ bool run_volk_tests(const int archs[], void (*manual_func)(), std::string name,
     
     bool fail = false;
     bool fail_global = false;
+    std::vector<bool> arch_results;
     for(int i=0; i<arch_list.size(); i++) {
+        fail = false;
         if(i != generic_offset) {
             for(int j=0; j<both_sigs.size(); j++) {
                 if(both_sigs[j].is_float) {
@@ -432,6 +412,21 @@ bool run_volk_tests(const int archs[], void (*manual_func)(), std::string name,
                 //fail = memcmp(outbuffs[generic_offset], outbuffs[i], outputsig[0].size * vlen * (outputsig[0].is_complex ? 2:1));
             }
         }
+        arch_results.push_back(!fail);
+    }
+        
+    double best_time = std::numeric_limits<double>::max();
+    std::string best_arch = "generic";
+    for(int i=0; i < arch_list.size(); i++) {
+        if((profile_times[i] < best_time) && arch_results[i]) {
+            best_time = profile_times[i];
+            best_arch = arch_list[i];
+        }
+    }
+        
+    std::cout << "Best arch: " << best_arch << std::endl;
+    if(best_arch_vector) {
+        best_arch_vector->push_back(name + std::string(" ") + best_arch);
     }
 
     return fail_global;
diff --git a/volk/lib/qa_utils.h b/volk/lib/qa_utils.h
index 1b64bacaa..a1bc1f20c 100644
--- a/volk/lib/qa_utils.h
+++ b/volk/lib/qa_utils.h
@@ -3,6 +3,9 @@
 
 #include <cstdlib>
 #include <string>
+#include <vector>
+#include <volk/volk.h>
+#include <volk/volk_common.h>
 
 struct volk_type_t {
     bool is_float;
@@ -18,10 +21,10 @@ volk_type_t volk_type_from_string(std::string);
 float uniform(void);
 void random_floats(float *buf, unsigned n);
 
-bool run_volk_tests(const int[], void(*)(), std::string, float, float, int, int);
-
-#define VOLK_RUN_TESTS(func, tol, scalar, len, iter) BOOST_CHECK_EQUAL(run_volk_tests(func##_arch_defs, (void (*)())func##_manual, std::string(#func), tol, scalar, len, iter), 0)
+bool run_volk_tests(struct volk_func_desc, void(*)(), std::string, float, float, int, int, std::vector<std::string> *);
 
+#define VOLK_RUN_TESTS(func, tol, scalar, len, iter) BOOST_AUTO_TEST_CASE(func##_test) { BOOST_CHECK_EQUAL(run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), tol, scalar, len, iter, 0), 0); }
+#define VOLK_PROFILE(func, tol, scalar, len, iter, results) run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), tol, scalar, len, iter, results)
 typedef void (*volk_fn_1arg)(void *, unsigned int, const char*); //one input, operate in place
 typedef void (*volk_fn_2arg)(void *, void *, unsigned int, const char*);
 typedef void (*volk_fn_3arg)(void *, void *, void *, unsigned int, const char*);
diff --git a/volk/lib/testqa.cc b/volk/lib/testqa.cc
index 779bc61eb..62e62c2f4 100644
--- a/volk/lib/testqa.cc
+++ b/volk/lib/testqa.cc
@@ -1,100 +1,93 @@
 #include "qa_utils.h"
 #include <volk/volk.h>
-#include <volk/volk_registry.h>
 #include <boost/test/unit_test.hpp>
 
-BOOST_AUTO_TEST_CASE(volk_test_all) {    
-    //in order...
-//    VOLK_RUN_TESTS(volk_16i_x5_add_quad_16i_x4_a16, 1e-4, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_16i_branch_4_state_8_a16, 1e-4, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_32f_x2_a16, 1e-4, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_deinterleave_real_16i_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a16, 1e-5, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_32f_x2_a16, 1e-4, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_deinterleave_real_16i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_magnitude_16i_a16, 1, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16ic_s32f_magnitude_32f_a16, 1e-5, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_a16, 1e-4, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_convert_8i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_max_star_16i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a16, 0, 0, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_16i_permute_and_scalar_add_a16, 1e-4, 0, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_16i_x4_quad_max_star_16i_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_16u_byteswap_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_accumulator_s32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_add_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_32f_multiply_32fc_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_s32f_power_32fc_a16, 1e-4, 0, 2046, 1000);
-    VOLK_RUN_TESTS(volk_32f_s32f_calc_spectral_noise_floor_32f_a16, 1e-4, 20.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_s32f_atan2_32f_a16, 1e-4, 10.0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_u, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_deinterleave_32f_x2_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_deinterleave_64f_x2_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_s32f_deinterleave_real_16i_a16, 0, 32768, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_deinterleave_real_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_deinterleave_real_64f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_dot_prod_32fc_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_index_max_16u_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i_a16, 1, 32768, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_magnitude_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_multiply_32fc_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_a16, 1, 32768, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_u, 1, 32768, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_a16, 1, 2<<31, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_u, 1, 2<<31, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_convert_64f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_convert_64f_u, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_a16, 1, 128, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_u, 1, 128, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_32fc_s32f_x2_power_spectral_density_32f_a16, 1e-4, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_s32f_power_spectrum_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a16, 1e-4, 10, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_32f_s32f_32f_fm_detect_32f_a16, 1e-4, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_index_max_16u_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a16, 1, 32768, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_interleave_32fc_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_max_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_min_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_multiply_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_normalize_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_power_32f_a16, 1e-4, 4, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_sqrt_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_s32f_stddev_32f_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_stddev_and_mean_32f_x2_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x2_subtract_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32f_x3_sum_of_poly_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32i_x2_and_32i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_u, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32i_x2_or_32i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_32u_byteswap_a16, 0, 0, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_32u_popcnt_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_64f_convert_32f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_64f_convert_32f_u, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_64f_x2_max_64f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_64f_x2_min_64f_a16, 1e-4, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_64u_byteswap_a16, 0, 0, 2046, 10000);
-//    VOLK_RUN_TESTS(volk_64u_popcnt_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_deinterleave_16i_x2_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_32f_x2_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_deinterleave_real_16i_a16, 0, 256, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_real_32f_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_deinterleave_real_8i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_x2_multiply_conjugate_16ic_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8ic_x2_s32f_multiply_conjugate_32fc_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8i_convert_16i_a16, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8i_convert_16i_u, 0, 0, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_a16, 1e-4, 100, 2046, 10000);
-    VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_u, 1e-4, 100, 2046, 10000);
+//VOLK_RUN_TESTS(volk_16i_x5_add_quad_16i_x4_a, 1e-4, 2046, 10000);
+//VOLK_RUN_TESTS(volk_16i_branch_4_state_8_a, 1e-4, 2046, 10000);
+VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_real_32f_a, 1e-5, 32768.0, 204600, 10000);
+VOLK_RUN_TESTS(volk_16ic_deinterleave_real_8i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16ic_deinterleave_16i_x2_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16ic_s32f_deinterleave_32f_x2_a, 1e-4, 32768.0, 20460, 1000);
+VOLK_RUN_TESTS(volk_16ic_deinterleave_real_16i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16ic_magnitude_16i_a, 1, 0, 20460, 100);
+VOLK_RUN_TESTS(volk_16ic_s32f_magnitude_32f_a, 1e-5, 32768.0, 20460, 1000);
+VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_a, 1e-4, 32768.0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16i_s32f_convert_32f_u, 1e-4, 32768.0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16i_convert_8i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16i_convert_8i_u, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16i_max_star_16i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_16i_max_star_horizontal_16i_a, 0, 0, 20460, 10000);
+//VOLK_RUN_TESTS(volk_16i_permute_and_scalar_add_a, 1e-4, 0, 2046, 1000);
+//VOLK_RUN_TESTS(volk_16i_x4_quad_max_star_16i_a, 1e-4, 0, 2046, 1000);
+VOLK_RUN_TESTS(volk_16u_byteswap_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_accumulator_s32f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_x2_add_32f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_32f_multiply_32fc_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_s32f_power_32fc_a, 1e-4, 0, 20460, 50);
+VOLK_RUN_TESTS(volk_32f_s32f_calc_spectral_noise_floor_32f_a, 1e-4, 20.0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_s32f_atan2_32f_a, 1e-4, 10.0, 20460, 100);
+//VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_a, 1e-4, 0, 2046, 10000);
+VOLK_RUN_TESTS(volk_32fc_x2_conjugate_dot_prod_32fc_u, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_deinterleave_32f_x2_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_deinterleave_64f_x2_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_s32f_deinterleave_real_16i_a, 0, 32768, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_deinterleave_real_32f_a, 1e-4, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32fc_deinterleave_real_64f_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_x2_dot_prod_32fc_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_index_max_16u_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_s32f_magnitude_16i_a, 1, 32768, 20460, 100);
+VOLK_RUN_TESTS(volk_32fc_magnitude_32f_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32fc_x2_multiply_32fc_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_a, 1, 32768, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_16i_u, 1, 32768, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_a, 1, 2<<31, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_32i_u, 1, 2<<31, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_convert_64f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_convert_64f_u, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_a, 1, 128, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_convert_8i_u, 1, 128, 20460, 10000);
+//VOLK_RUN_TESTS(volk_32fc_s32f_x2_power_spectral_density_32f_a, 1e-4, 2046, 10000);
+VOLK_RUN_TESTS(volk_32fc_s32f_power_spectrum_32f_a, 1e-4, 0, 2046, 100);
+VOLK_RUN_TESTS(volk_32fc_x2_square_dist_32f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a, 1e-4, 10, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_x2_divide_32f_a, 1e-4, 0, 20460, 2000);
+VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_a, 1e-4, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32f_x2_dot_prod_32f_u, 1e-4, 0, 20460, 5000);
+//VOLK_RUN_TESTS(volk_32f_s32f_32f_fm_detect_32f_a, 1e-4, 2046, 10000);
+VOLK_RUN_TESTS(volk_32f_index_max_16u_a, 0, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32f_x2_s32f_interleave_16ic_a, 1, 32768, 20460, 3000);
+VOLK_RUN_TESTS(volk_32f_x2_interleave_32fc_a, 0, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32f_x2_max_32f_a, 1e-4, 0, 20460, 2000);
+VOLK_RUN_TESTS(volk_32f_x2_min_32f_a, 1e-4, 0, 20460, 2000);
+VOLK_RUN_TESTS(volk_32f_x2_multiply_32f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_normalize_a, 1e-4, 100, 20460, 10000);
+VOLK_RUN_TESTS(volk_32f_s32f_power_32f_a, 1e-4, 4, 20460, 100);
+VOLK_RUN_TESTS(volk_32f_sqrt_32f_a, 1e-4, 0, 20460, 100);
+VOLK_RUN_TESTS(volk_32f_s32f_stddev_32f_a, 1e-4, 100, 20460, 3000);
+VOLK_RUN_TESTS(volk_32f_stddev_and_mean_32f_x2_a, 1e-4, 0, 20460, 3000);
+VOLK_RUN_TESTS(volk_32f_x2_subtract_32f_a, 1e-4, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32f_x3_sum_of_poly_32f_a, 1e-4, 0, 20460, 5000);
+VOLK_RUN_TESTS(volk_32i_x2_and_32i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_a, 1e-4, 100, 20460, 10000);
+VOLK_RUN_TESTS(volk_32i_s32f_convert_32f_u, 1e-4, 100, 20460, 10000);
+VOLK_RUN_TESTS(volk_32i_x2_or_32i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_32u_byteswap_a, 0, 0, 20460, 2000);
+//VOLK_RUN_TESTS(volk_32u_popcnt_a, 0, 0, 2046, 10000);
+VOLK_RUN_TESTS(volk_64f_convert_32f_a, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_64f_convert_32f_u, 1e-4, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_64f_x2_max_64f_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_64f_x2_min_64f_a, 1e-4, 0, 20460, 1000);
+VOLK_RUN_TESTS(volk_64u_byteswap_a, 0, 0, 20460, 1000);
+//VOLK_RUN_TESTS(volk_64u_popcnt_a, 0, 0, 2046, 10000);
+VOLK_RUN_TESTS(volk_8ic_deinterleave_16i_x2_a, 0, 0, 20460, 3000);
+VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_32f_x2_a, 1e-4, 100, 20460, 3000);
+VOLK_RUN_TESTS(volk_8ic_deinterleave_real_16i_a, 0, 256, 20460, 3000);
+VOLK_RUN_TESTS(volk_8ic_s32f_deinterleave_real_32f_a, 1e-4, 100, 20460, 3000);
+VOLK_RUN_TESTS(volk_8ic_deinterleave_real_8i_a, 0, 0, 20460, 10000);
+VOLK_RUN_TESTS(volk_8ic_x2_multiply_conjugate_16ic_a, 0, 0, 20460, 400);
+VOLK_RUN_TESTS(volk_8ic_x2_s32f_multiply_conjugate_32fc_a, 1e-4, 100, 20460, 400);
+VOLK_RUN_TESTS(volk_8i_convert_16i_a, 0, 0, 20460, 20000);
+VOLK_RUN_TESTS(volk_8i_convert_16i_u, 0, 0, 20460, 2000);
+VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_a, 1e-4, 100, 20460, 2000);
+VOLK_RUN_TESTS(volk_8i_s32f_convert_32f_u, 1e-4, 100, 20460, 2000);
 
-}
diff --git a/volk/lib/volk_prefs.c b/volk/lib/volk_prefs.c
new file mode 100644
index 000000000..9743c51d9
--- /dev/null
+++ b/volk/lib/volk_prefs.c
@@ -0,0 +1,49 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <volk/volk_prefs.h>
+
+//#if defined(_WIN32)
+//#include <Windows.h>
+//#endif
+
+void get_config_path(char *path) {
+    const char *suffix = "/.volk/volk_config";
+    strcpy(path, getenv("HOME"));
+    strcat(path, suffix);
+}
+
+//passing by reference in C can (***********)
+int load_preferences(struct volk_arch_pref **prefs) {
+    FILE *config_file;
+    char path[512], line[512], function[128], arch[32];
+    int n_arch_prefs = 0;
+    struct volk_arch_pref *t_pref;
+    
+    //get the config path
+    get_config_path(path);
+    config_file = fopen(path, "r");
+    if(!config_file) return; //no prefs found
+
+    while(fgets(line, 512, config_file) != NULL) {
+        if(sscanf(line, "%s %s", function, arch) == 2 && !strncmp(function, "volk_", 5)) {
+            n_arch_prefs++;
+        }
+    }
+
+    //now allocate the memory required for volk_arch_prefs
+    (*prefs) = (struct volk_arch_pref *) malloc(n_arch_prefs * sizeof(struct volk_arch_pref));
+    t_pref = (*prefs);
+
+    //reset the file pointer and write the prefs into volk_arch_prefs
+    rewind(config_file);
+    while(fgets(line, 512, config_file) != NULL) {
+        if(sscanf(line, "%s %s", function, arch) == 2 && !strncmp(function, "volk_", 5)) {
+            strncpy(t_pref->name, function, 128);
+            strncpy(t_pref->arch, arch, 32);
+            t_pref++;
+        }
+    }
+    fclose(config_file);
+    return n_arch_prefs;
+}
diff --git a/volk/lib/volk_rank_archs.c b/volk/lib/volk_rank_archs.c
index b1a93db26..e10433fd0 100644
--- a/volk/lib/volk_rank_archs.c
+++ b/volk/lib/volk_rank_archs.c
@@ -1,10 +1,40 @@
-#include<volk_rank_archs.h>
-#include<stdio.h>
+#include <volk_rank_archs.h>
+#include <volk/volk_prefs.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-unsigned int volk_rank_archs(const int* arch_defs, unsigned int arch) {
-  int i = 2;
+unsigned int get_index(const char *indices[], unsigned int n_archs, const char *arch_name) {
+    int i;
+    for(i=0; i<n_archs; i++) {
+        if(!strncmp(indices[i], arch_name, 20)) {
+            return i;
+        }
+    }
+    //something terrible should happen here
+    printf("Volk warning: no arch found, returning generic impl\n");
+    return get_index(indices, n_archs, "generic"); //but we'll fake it for now
+}
+
+unsigned int volk_rank_archs(const char *indices[], const int* arch_defs, unsigned int n_archs, const char* name, unsigned int arch) {
+  int i;
   unsigned int best_val = 0;
-  for(; i < arch_defs[0] + 1; ++i) {
+  static struct volk_arch_pref *volk_arch_prefs;
+  static int n_arch_prefs = 0;
+  static int prefs_loaded = 0;
+  if(!prefs_loaded) {
+      n_arch_prefs = load_preferences(&volk_arch_prefs);
+      prefs_loaded = 1;
+  }
+  
+  //now look for the function name in the prefs list
+  for(i=0; i < n_arch_prefs; i++) {
+      if(!strncmp(name, volk_arch_prefs[i].name, 128)) { //found it
+        return get_index(indices, n_archs, volk_arch_prefs[i].arch);
+      }
+  }
+  
+  for(i=1; i < n_archs; ++i) {
     if((arch_defs[i]&(!arch)) == 0) {
       best_val = (arch_defs[i] > arch_defs[best_val + 1]) ? i-1 : best_val;
     }
diff --git a/volk/lib/volk_rank_archs.h b/volk/lib/volk_rank_archs.h
index 26b9f7503..546240d2c 100644
--- a/volk/lib/volk_rank_archs.h
+++ b/volk/lib/volk_rank_archs.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-unsigned int volk_rank_archs(const int* arch_defs, unsigned int arch);
- 
+unsigned int get_index(const char *indices[], unsigned int n_archs, const char *arch_name);
+unsigned int volk_rank_archs(const char *indices[], const int* arch_defs, unsigned int n_archs, const char *name, unsigned int arch);
 
 #ifdef __cplusplus
 }
diff --git a/volk/msvc/inttypes.h b/volk/msvc/inttypes.h
new file mode 100644
index 000000000..1c2baa82e
--- /dev/null
+++ b/volk/msvc/inttypes.h
@@ -0,0 +1,301 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <stdint.h>
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]
diff --git a/volk/msvc/stdint.h b/volk/msvc/stdint.h
new file mode 100644
index 000000000..ab6d37e11
--- /dev/null
+++ b/volk/msvc/stdint.h
@@ -0,0 +1,251 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#ifndef INTMAX_C
+#define INTMAX_C   INT64_C
+#endif
+#ifndef UINTMAX_C
+#define UINTMAX_C  UINT64_C
+#endif
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/volk/orc/Makefile.am b/volk/orc/Makefile.am
index 6b5e4f8b6..814471bd0 100644
--- a/volk/orc/Makefile.am
+++ b/volk/orc/Makefile.am
@@ -21,31 +21,31 @@
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(ORC_CFLAGS)
 
 include $(top_srcdir)/Makefile.common
-lib_LTLIBRARIES = libvolk_orc.la
+noinst_LTLIBRARIES = libvolk_orc.la
 libvolk_orc_la_LDFLAGS = $(ORC_LDFLAGS)
 
 libvolk_orc_la_SOURCES = \
-volk_8i_convert_16i_a16_orc_impl.orc \
-volk_8i_s32f_convert_32f_a16_orc_impl.orc \
-volk_16u_byteswap_a16_orc_impl.orc \
-volk_32i_x2_and_32i_a16_orc_impl.orc \
-volk_32i_x2_or_32i_a16_orc_impl.orc \
-volk_32f_x2_add_32f_a16_orc_impl.orc \
-volk_32f_x2_subtract_32f_a16_orc_impl.orc \
-volk_32f_x2_divide_32f_a16_orc_impl.orc \
-volk_32f_x2_multiply_32f_a16_orc_impl.orc \
-volk_32fc_x2_multiply_32fc_a16_orc_impl.orc \
-volk_32fc_32f_multiply_32fc_a16_orc_impl.orc \
-volk_32f_sqrt_32f_a16_orc_impl.orc \
-volk_32f_x2_max_32f_a16_orc_impl.orc \
-volk_32f_x2_min_32f_a16_orc_impl.orc \
-volk_32f_s32f_normalize_a16_orc_impl.orc \
-volk_32fc_magnitude_32f_a16_orc_impl.orc \
-volk_32fc_s32f_magnitude_16i_a16_orc_impl.orc \
-volk_16ic_magnitude_16i_a16_orc_impl.orc \
-volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc \
-volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc \
-volk_16ic_deinterleave_real_8i_a16_orc_impl.orc
+volk_8i_convert_16i_a_orc_impl.orc \
+volk_8i_s32f_convert_32f_a_orc_impl.orc \
+volk_16u_byteswap_a_orc_impl.orc \
+volk_32i_x2_and_32i_a_orc_impl.orc \
+volk_32i_x2_or_32i_a_orc_impl.orc \
+volk_32f_x2_add_32f_a_orc_impl.orc \
+volk_32f_x2_subtract_32f_a_orc_impl.orc \
+volk_32f_x2_divide_32f_a_orc_impl.orc \
+volk_32f_x2_multiply_32f_a_orc_impl.orc \
+volk_32fc_x2_multiply_32fc_a_orc_impl.orc \
+volk_32fc_32f_multiply_32fc_a_orc_impl.orc \
+volk_32f_sqrt_32f_a_orc_impl.orc \
+volk_32f_x2_max_32f_a_orc_impl.orc \
+volk_32f_x2_min_32f_a_orc_impl.orc \
+volk_32f_s32f_normalize_a_orc_impl.orc \
+volk_32fc_magnitude_32f_a_orc_impl.orc \
+volk_32fc_s32f_magnitude_16i_a_orc_impl.orc \
+volk_16ic_magnitude_16i_a_orc_impl.orc \
+volk_16ic_deinterleave_16i_x2_a_orc_impl.orc \
+volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc \
+volk_16ic_deinterleave_real_8i_a_orc_impl.orc
 
 
 
diff --git a/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc b/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc
index 0189fbf5d..fd8915da0 100644
--- a/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a16_orc_impl.orc
+++ b/volk/orc/volk_16i_s32f_deinterleave_32f_x2_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_s32f_deinterleave_32f_x2_a16_orc_impl
+.function volk_16ic_s32f_deinterleave_32f_x2_a_orc_impl
 .dest 4 idst
 .dest 4 qdst
 .source 4 src
diff --git a/volk/orc/volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc b/volk/orc/volk_16ic_deinterleave_16i_x2_a_orc_impl.orc
index 56018edda..76faa936a 100644
--- a/volk/orc/volk_16ic_deinterleave_16i_x2_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_deinterleave_16i_x2_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_deinterleave_16i_x2_a16_orc_impl
+.function volk_16ic_deinterleave_16i_x2_a_orc_impl
 .dest 2 idst
 .dest 2 qdst
 .source 4 src
diff --git a/volk/orc/volk_16ic_deinterleave_real_8i_a16_orc_impl.orc b/volk/orc/volk_16ic_deinterleave_real_8i_a_orc_impl.orc
index dba9a4c8e..8db49fd7c 100644
--- a/volk/orc/volk_16ic_deinterleave_real_8i_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_deinterleave_real_8i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_deinterleave_real_8i_a16_orc_impl
+.function volk_16ic_deinterleave_real_8i_a_orc_impl
 .dest 1 dst
 .source 4 src
 .temp 2 iw
diff --git a/volk/orc/volk_16ic_magnitude_16i_a16_orc_impl.orc b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
index 37225e9b8..fbaebc46d 100644
--- a/volk/orc/volk_16ic_magnitude_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_magnitude_16i_a16_orc_impl
+.function volk_16ic_magnitude_16i_a_orc_impl
 .source 4 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
index 1e2380837..66fef7d2e 100644
--- a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_16ic_magnitude_32f_a16_orc_impl
+.function volk_16ic_magnitude_32f_a_orc_impl
 .source 4 src
 .dest 4 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_16u_byteswap_a16_orc_impl.orc b/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
deleted file mode 100644
index c1c8ee59e..000000000
--- a/volk/orc/volk_16u_byteswap_a16_orc_impl.orc
+++ /dev/null
@@ -1,3 +0,0 @@
-.function volk_16u_byteswap_a16_orc_impl
-.dest 2 dst
-swapw dst, dst
diff --git a/volk/orc/volk_16u_byteswap_a_orc_impl.orc b/volk/orc/volk_16u_byteswap_a_orc_impl.orc
new file mode 100644
index 000000000..b96ba84af
--- /dev/null
+++ b/volk/orc/volk_16u_byteswap_a_orc_impl.orc
@@ -0,0 +1,3 @@
+.function volk_16u_byteswap_a_orc_impl
+.dest 2 dst
+swapw dst, dst
diff --git a/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc b/volk/orc/volk_32f_s32f_normalize_a_orc_impl.orc
index acd319b16..986fdf665 100644
--- a/volk/orc/volk_32f_s32f_normalize_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_s32f_normalize_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_s32f_normalize_a16_orc_impl
+.function volk_32f_s32f_normalize_a_orc_impl
 .source 4 src1
 .floatparam 4 invscalar
 .dest 4 dst
diff --git a/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc b/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
index ae5680f15..f339b1122 100644
--- a/volk/orc/volk_32f_sqrt_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_sqrt_32f_a16_orc_impl
+.function volk_32f_sqrt_32f_a_orc_impl
 .source 4 src
 .dest 4 dst
 sqrtf dst, src
diff --git a/volk/orc/volk_32f_x2_add_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_add_32f_a_orc_impl.orc
index 8d095a052..450cc6a9e 100644
--- a/volk/orc/volk_32f_x2_add_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_add_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_add_32f_a16_orc_impl
+.function volk_32f_x2_add_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_divide_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_divide_32f_a_orc_impl.orc
index 0097646cb..ee3b61b82 100644
--- a/volk/orc/volk_32f_x2_divide_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_divide_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_divide_32f_a16_orc_impl
+.function volk_32f_x2_divide_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc b/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc
new file mode 100644
index 000000000..b367f3091
--- /dev/null
+++ b/volk/orc/volk_32f_x2_dot_prod_32f_a_orc_impl.orc
@@ -0,0 +1,6 @@
+.function volk_32f_x2_dot_prod_32f_a_orc_impl
+.source 4 src1
+.source 4 src2
+.dest 4 dst
+.accumulator 4 accum
+addf dst, src1, src2
diff --git a/volk/orc/volk_32f_x2_max_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_max_32f_a_orc_impl.orc
index b7f008737..725201633 100644
--- a/volk/orc/volk_32f_x2_max_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_max_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_max_32f_a16_orc_impl
+.function volk_32f_x2_max_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_min_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_min_32f_a_orc_impl.orc
index 78328b576..a71ed8250 100644
--- a/volk/orc/volk_32f_x2_min_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_min_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_min_32f_a16_orc_impl
+.function volk_32f_x2_min_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_multiply_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_multiply_32f_a_orc_impl.orc
index e8fadff19..c17d539fd 100644
--- a/volk/orc/volk_32f_x2_multiply_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_multiply_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_multiply_32f_a16_orc_impl
+.function volk_32f_x2_multiply_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32f_x2_subtract_32f_a16_orc_impl.orc b/volk/orc/volk_32f_x2_subtract_32f_a_orc_impl.orc
index 13fbe8c83..b3b0f256e 100644
--- a/volk/orc/volk_32f_x2_subtract_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32f_x2_subtract_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32f_x2_subtract_32f_a16_orc_impl
+.function volk_32f_x2_subtract_32f_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc b/volk/orc/volk_32fc_32f_multiply_32fc_a_orc_impl.orc
index 455293cff..aa82699f5 100644
--- a/volk/orc/volk_32fc_32f_multiply_32fc_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_32f_multiply_32fc_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_32f_multiply_32fc_a16_orc_impl
+.function volk_32fc_32f_multiply_32fc_a_orc_impl
 .source 8 src1
 .source 4 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
index c5e2e57f1..032ab2b1b 100644
--- a/volk/orc/volk_32fc_magnitude_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_magnitude_32f_a16_orc_impl
+.function volk_32fc_magnitude_32f_a_orc_impl
 .source 8 src
 .dest 4 dst
 .temp 8 iqf
diff --git a/volk/orc/volk_32fc_s32f_magnitude_16i_a16_orc_impl.orc b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
index 6116f5e1f..505e73f5d 100644
--- a/volk/orc/volk_32fc_s32f_magnitude_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_s32f_magnitude_16i_a16_orc_impl
+.function volk_32fc_s32f_magnitude_16i_a_orc_impl
 .source 8 src
 .dest 2 dst
 .floatparam 4 scalar
diff --git a/volk/orc/volk_32fc_x2_multiply_32fc_a16_orc_impl.orc b/volk/orc/volk_32fc_x2_multiply_32fc_a_orc_impl.orc
index a27d722cd..cb8a12d81 100644
--- a/volk/orc/volk_32fc_x2_multiply_32fc_a16_orc_impl.orc
+++ b/volk/orc/volk_32fc_x2_multiply_32fc_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32fc_x2_multiply_32fc_a16_orc_impl
+.function volk_32fc_x2_multiply_32fc_a_orc_impl
 .source 8 src1
 .source 8 src2
 .dest 8 dst
diff --git a/volk/orc/volk_32i_x2_and_32i_a16_orc_impl.orc b/volk/orc/volk_32i_x2_and_32i_a_orc_impl.orc
index 7b331f8ed..1845e4654 100644
--- a/volk/orc/volk_32i_x2_and_32i_a16_orc_impl.orc
+++ b/volk/orc/volk_32i_x2_and_32i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32i_x2_and_32i_a16_orc_impl
+.function volk_32i_x2_and_32i_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_32i_x2_or_32i_a16_orc_impl.orc b/volk/orc/volk_32i_x2_or_32i_a_orc_impl.orc
index 4984a9ced..004663f42 100644
--- a/volk/orc/volk_32i_x2_or_32i_a16_orc_impl.orc
+++ b/volk/orc/volk_32i_x2_or_32i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_32i_x2_or_32i_a16_orc_impl
+.function volk_32i_x2_or_32i_a_orc_impl
 .dest 4 dst
 .source 4 src1
 .source 4 src2
diff --git a/volk/orc/volk_8i_convert_16i_a16_orc_impl.orc b/volk/orc/volk_8i_convert_16i_a_orc_impl.orc
index f44845c88..d813c6cfa 100644
--- a/volk/orc/volk_8i_convert_16i_a16_orc_impl.orc
+++ b/volk/orc/volk_8i_convert_16i_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8i_convert_16i_a16_orc_impl
+.function volk_8i_convert_16i_a_orc_impl
 .source 1 src
 .dest 2 dst
 convsbw dst, src
diff --git a/volk/orc/volk_8i_s32f_convert_32f_a16_orc_impl.orc b/volk/orc/volk_8i_s32f_convert_32f_a_orc_impl.orc
index 8f6e157e9..ad54fb1e1 100644
--- a/volk/orc/volk_8i_s32f_convert_32f_a16_orc_impl.orc
+++ b/volk/orc/volk_8i_s32f_convert_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
-.function volk_8i_s32f_convert_32f_a16_orc_impl
+.function volk_8i_s32f_convert_32f_a_orc_impl
 .source 1 src
 .dest 4 dst
 .floatparam 4 scalar
diff --git a/volk/volk.pc.in b/volk/volk.pc.in
index 85425ba64..58e976786 100644
--- a/volk/volk.pc.in
+++ b/volk/volk.pc.in
@@ -5,11 +5,10 @@ includedir=@includedir@
 LV_CXXFLAGS=@LV_CXXFLAGS@
 
 
-
 Name: volk
-Description: VOLK.. Vector Optimized Library of Kernels
+Description: VOLK: Vector Optimized Library of Kernels
 Requires:
 Version: @VERSION@
-Libs: -lvolk -lvolk_runtime @LV_ORC_PKGCONFIG@
+Libs: -lvolk
 Cflags: -I${includedir} ${LV_CXXFLAGS}