diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index 218a6b166c5ad1e7bfb112c4186985e13b89c171..17622db1ae38fa2ece3c458bc9351e4f10b81dd7 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -1334,7 +1334,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
       eNB_common_vars->txdataF_BF[eNB_id] = (int32_t **)malloc16(frame_parms->nb_antennas_tx*sizeof(int32_t*));
 
       for (i=0; i<14; i++) {
-        eNB_common_vars->txdataF[eNB_id][i] = (mod_sym_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(mod_sym_t) );
+        eNB_common_vars->txdataF[eNB_id][i] = (int32_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX*sizeof(int32_t) );
 #ifdef DEBUG_PHY
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF[%d][%d] = %p (%d bytes)\n",
             eNB_id,i,eNB_common_vars->txdataF[eNB_id][i],
@@ -1343,7 +1343,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
       }
 
       for (i=0; i<frame_parms->nb_antennas_tx; i++) {
-        eNB_common_vars->txdataF_BF[eNB_id][i] = (mod_sym_t*)malloc16_clear( OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(mod_sym_t) );
+        eNB_common_vars->txdataF_BF[eNB_id][i] = (int32_t*)malloc16_clear( OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t) );
 #ifdef USER_MODE
         eNB_common_vars->txdata[eNB_id][i]  = (int32_t*)malloc16_clear( FRAME_LENGTH_COMPLEX_SAMPLES*sizeof(int32_t) );
 #else  // USER_MODE
@@ -1352,7 +1352,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *phy_vars_eNB,
 #ifdef DEBUG_PHY
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdataF_BF[%d][%d][%d] = %p (%d bytes)\n",
             eNB_id,i,j,eNB_common_vars->txdataF_BF[eNB_id][i][j],
-            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(mod_sym_t));
+            OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES*sizeof(int32_t));
         msg("[openair][LTE_PHY][INIT] lte_eNB_common_vars->txdata[%d][%d] = %p\n",eNB_id,i,eNB_common_vars->txdata[eNB_id][i]);
 #endif
       }
diff --git a/openair1/PHY/LTE_REFSIG/defs.h b/openair1/PHY/LTE_REFSIG/defs.h
index 9377368d7df88bce2da47cde53933f5084227c3e..e8c3f7c807a8abd8aebbec45d6a8fd79ab67a891 100644
--- a/openair1/PHY/LTE_REFSIG/defs.h
+++ b/openair1/PHY/LTE_REFSIG/defs.h
@@ -139,7 +139,7 @@ int lte_dl_cell_spec_rx(PHY_VARS_UE *phy_vars_ue,
 @param nRB_PDSCH number of allocated PDSCH RBs
 */
 int lte_dl_ue_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                      mod_sym_t *output,
+                      int32_t *output,
                       unsigned char Ns,
                       unsigned char p,
                       int lprime,
diff --git a/openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c b/openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
index d029f959ed54bdefe04359d49ba06af4d4471609..a1926ba6b4167c6f55360dab106711823b229308 100644
--- a/openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
+++ b/openair1/PHY/LTE_REFSIG/lte_dl_ue_spec.c
@@ -55,7 +55,7 @@ int Wbar_NCP[8][4] = {{1,1,1,1},{1,-1,1,-1},{1,1,1,1},{1,-1,1,-1},{1,1,-1,-1},{-
 /*
 int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
                    uint8_t UE_id,
-                   mod_sym_t *output,
+                   int32_t *output,
                    short amp,
                    uint8_t Ns,
 		   uint8_t lprime,
@@ -63,7 +63,7 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
                    int SS_flag)
 {
 
-  mod_sym_t qpsk[4],nqpsk[4];
+  int32_t qpsk[4],nqpsk[4];
   int16_t k=0,a;
   int mprime,ind,ind_dword,ind_qpsk_symb;
   unsigned nushift,kprime;
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
 
 
 int lte_dl_ue_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                      mod_sym_t *output,
+                      int32_t *output,
                       unsigned char Ns,
                       unsigned char p, 
                       int lprime,
                       int SS_flag,
                       uint16_t nRB_PDSCH)
 {
-  mod_sym_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
+  int32_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
   int w,mprime,ind,l,ind_dword,ind_qpsk_symb,nPRB;
   short pamp;
 
diff --git a/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c b/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
index 7b788514f551137e5bc601c8e0e18de57545e3d5..5f301808831b1bc13bd4908b4d94c06244d572fe 100644
--- a/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
+++ b/openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
@@ -133,14 +133,14 @@ int lte_dl_ue_spec(PHY_VARS_eNB *phy_vars_eNB,
 
 
 int lte_dl_ue_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                      mod_sym_t *output,
+                      int32_t *output,
                       unsigned char Ns,
                       unsigned char p, 
                       int lprime,
                       int SS_flag,
                       uint16_t nRB_PDSCH)
 {
-  mod_sym_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
+  int32_t qpsk[4],nqpsk[4],*qpsk_p,*output_p;
   int w,mprime,ind,l,ind_dword,ind_qpsk_symb,nPRB;
   short pamp;
 
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
index 723e3eee90c8fa396f6521f739f62df5d462c048..b96d60a8f6e1d6c6fe5cd59b4a899883233c5b99 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
@@ -232,7 +232,7 @@ int allocate_REs_in_RB(PHY_VARS_eNB *phy_vars_eNB,
   int s=1;
         
   int mprime2 = mprime,ind,ind_dword,ind_qpsk_symb;
-  mod_sym_t qpsk[4];
+  int32_t qpsk[4];
 
   gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
   //  if (mimo_mode == LARGE_CDD) gain_lin_QPSK>>=1;
diff --git a/openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c b/openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
index 4651308dfd8d59dd3baa16a75ec2841f283ca23e..4a9010fca0daa712a9db006f0bbf87594283668f 100644
--- a/openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
+++ b/openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
@@ -42,7 +42,7 @@
 
 void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
                      uint8_t UE_id,
-                     mod_sym_t **txdataF,
+                     int32_t **txdataF,
                      int16_t amp,
                      uint16_t Ntti,
 		     uint8_t beamforming_mode)
@@ -127,7 +127,7 @@ void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
 }
 
 /*int generate_ue_spec_pilots_slot(PHY_VARS_eNB *phy_vars_eNB,
-                         mod_sym_t **txdataF,
+                         int32_t **txdataF,
                          int16_t amp,
                          uint16_t slot,
                          int first_pilot_only)
diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h
index 17338ebb784ac4652e717099e451064ac4359a3f..d775aea822b65d25951cf88e0ca7180bc1ef447f 100644
--- a/openair1/PHY/LTE_TRANSPORT/proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto.h
@@ -306,10 +306,9 @@ int32_t generate_mbsfn_pilot(PHY_VARS_eNB *phy_vars_eNB,
                              int16_t amp,
                              uint16_t subframe);
 
-<<<<<<< HEAD
 void generate_ue_spec_pilots(PHY_VARS_eNB *phy_vars_eNB,
                              uint8_t UE_id,
-                             mod_sym_t **txdataF,
+                             int32_t **txdataF,
                              int16_t amp,
                              uint16_t Ntti,
 		             uint8_t beamforming_mode);
diff --git a/openair1/PHY/MODULATION/ofdm_mod.c b/openair1/PHY/MODULATION/ofdm_mod.c
index 23d5ed1269b357f5cceb56db139124454eab46ab..1f7aeb533ad007a0725757f8448f8368eab22549 100755
--- a/openair1/PHY/MODULATION/ofdm_mod.c
+++ b/openair1/PHY/MODULATION/ofdm_mod.c
@@ -296,8 +296,8 @@ void do_OFDM_mod_l(LTE_eNB_COMMON *eNB_common_vars, int eNB_id, uint16_t next_sl
 
   int aa, l, slot_offset, slot_offset_F;
   int8_t UE_id=0;
-  mod_sym_t **txdataF = eNB_common_vars->txdataF[eNB_id];
-  mod_sym_t **txdataF_BF = eNB_common_vars->txdataF_BF[eNB_id];
+  int32_t **txdataF = eNB_common_vars->txdataF[eNB_id];
+  int32_t **txdataF_BF = eNB_common_vars->txdataF_BF[eNB_id];
   int32_t **txdata = eNB_common_vars->txdata[eNB_id];
 
   //slot_offset_F = (next_slot)*(frame_parms->ofdm_symbol_size)*((frame_parms->Ncp==1) ? 6 : 7);
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index 886d02c954baad55625d03f7f156d87b1fde9d1b..378c79803bd814db25f0c409aaaec2eee279def6 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -505,11 +505,8 @@ int main(int argc, char **argv)
         exit(-1);
       }
 
-      if (transmission_mode>1 && transmission_mode<7){
+      if (transmission_mode>1 && transmission_mode<7) {
         n_tx_port = 2;
-        n_tx_phy = n_tx_port;
-      } else if (transmission_mode==7){
-        n_tx_port = 1;
       }
 
       break;
@@ -521,14 +518,10 @@ int main(int argc, char **argv)
         if(n_tx_phy==1) {
           msg("n_tx_phy must be >1 for transmission_mode %d\n",transmission_mode);
           exit(-1);
-        } else if (n_tx_phy!=n_tx_port) { // to be changed 
-          msg("For transmission mode TM2-TM6, physical antenna number should be the same as antenna port number.\n");
-	  exit(-1);
-        }
+        } 
       }
 
       if (transmission_mode==7 && (n_tx_phy!=1 && n_tx_phy!=2 && n_tx_phy!=4 && n_tx_phy!=8 && n_tx_phy!=16 && n_tx_phy!=64 && n_tx_phy!=128)) {
-     // if (transmission_mode==7 && (n_tx_phy!=1 && n_tx_phy!=2 && n_tx_phy!=4 && n_tx_phy!=16 && n_tx_phy!=64)) {
         msg("Physical number of antennas not supported for TM7.\n");
         exit(-1);
       }
@@ -616,8 +609,6 @@ int main(int argc, char **argv)
   } else
     NB_RB = 4;
 
-  /*if ((transmission_mode > 1) && (n_tx != 2))
-    printf("n_tx must be >1 for transmission_mode %d\n",transmission_mode);*/
 
   if (xforms==1) {
     fl_initialize (&argc, argv, NULL, 0, 0);
@@ -673,15 +664,6 @@ int main(int argc, char **argv)
   snr1 = snr0+snr_int;
   printf("SNR0 %f, SNR1 %f\n",snr0,snr1);
 
-  /*
-    txdataF    = (int **)malloc16(2*sizeof(int*));
-    txdataF[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-    txdataF[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-
-    txdata    = (int **)malloc16(2*sizeof(int*));
-    txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
-    txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-  */
 
   s_re = malloc(n_tx_phy*sizeof(double*));
   s_im = malloc(n_tx_phy*sizeof(double*));