diff --git a/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf b/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf
index e62e2c553..9f9b01577 100644
--- a/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf
+++ b/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf
@@ -9,7 +9,7 @@
 
 ;######### GLOBAL OPTIONS ##################
 ;internal_fs_sps: Internal signal sampling frequency after the signal conditioning stage [samples per second].
-GNSS-SDR.internal_fs_sps=10000000
+GNSS-SDR.internal_fs_sps=30000000
 Receiver.sources_count=2
 
 ;######### CONTROL_THREAD CONFIG ############
@@ -28,9 +28,9 @@ SignalSource0.enable_throttle_control=false
 
 ;# Signal Source config for BDS signals
 SignalSource1.implementation=File_Signal_Source
-SignalSource1.filename=/archive/BDS3_datasets/long/20180713_211400_1.dat
+SignalSource1.filename=/archive/BDS3_datasets/long/20180713_211400_2.dat
 SignalSource1.item_type=ibyte
-SignalSource1.sampling_frequency=10000000
+SignalSource1.sampling_frequency=30000000
 SignalSource1.samples=0
 SignalSource1.repeat=false
 SignalSource1.dump=false
@@ -60,9 +60,9 @@ InputFilter0.filter_type=bandpass
 InputFilter0.grid_density=16
 InputFilter0.sampling_frequency=10000000
 InputFilter0.IF=420000
-Resampler0.implementation=Pass_Through
+Resampler0.implementation=Direct_Resampler
 Resampler0.sample_freq_in=10000000
-Resampler0.sample_freq_out=10000000
+Resampler0.sample_freq_out=30000000
 Resampler0.item_type=gr_complex
 
 ;# Signal Conditioner config for BDS signals
@@ -87,17 +87,16 @@ InputFilter1.band2_error=1.0
 InputFilter1.filter_type=bandpass
 InputFilter1.grid_density=16
 InputFilter1.sampling_frequency=10000000
-InputFilter1.IF=1098000
+InputFilter1.IF=1020000
 Resampler1.implementation=Pass_Through
-Resampler1.sample_freq_in=10000000
-Resampler1.sample_freq_out=10000000
+Resampler1.sample_freq_in=30000000
+Resampler1.sample_freq_out=30000000
 Resampler1.item_type=gr_complex
 
 ;######### CHANNELS GLOBAL CONFIG ############
 Channels_1C.count=7
-Channels_1B.count=7
-Channels_B1.count=4
-Channels.in_acquisition=18
+Channels_B3.count=4
+Channels.in_acquisition=11
 
 ;# Preparing collection for GPS satellites
 Channel0.RF_channel_ID=0
@@ -122,98 +121,56 @@ Channel5.satellite = 6
 Channel6.signal=1C
 Channel6.satellite = 29
 
-;# Preparing collection for Galileo satellites
-Channel7.RF_channel_ID=0
-Channel8.RF_channel_ID=0
-Channel9.RF_channel_ID=0
-Channel10.RF_channel_ID=0
-Channel11.RF_channel_ID=0
-Channel12.RF_channel_ID=0
-Channel13.RF_channel_ID=0
-Channel7.signal=1B
-Channel7.satellite = 30
-Channel8.signal=1B
-Channel8.satellite = 21
-Channel9.signal=1B
-Channel9.satellite = 5
-Channel10.signal=1B
-Channel10.satellite = 3
-Channel11.signal=1B
-Channel11.satellite = 27
-Channel12.signal=1B
-Channel12.satellite = 9
-Channel13.signal=1B
-Channel13.satellite = 10
-
 ;# Preparing collection for BDS satellites
-Channel14.RF_channel_ID=1
-Channel15.RF_channel_ID=1
-Channel16.RF_channel_ID=1
-Channel17.RF_channel_ID=1
-Channel18.RF_channel_ID=1
-Channel19.RF_channel_ID=1
-Channel20.RF_channel_ID=1
-Channel21.RF_channel_ID=1
-Channel22.RF_channel_ID=1
-Channel23.RF_channel_ID=1
+Channel7.RF_channel_ID=1
+Channel8.RF_channel_ID=1
+Channel9.RF_channel_ID=1
+Channel10.RF_channel_ID=1
 
-Channel14.signal=B1
-Channel14.satellite = 29
-Channel15.signal=B1
-Channel15.satellite = 19
-Channel16.signal=B1
-Channel16.satellite = 20
-Channel17.signal=B1
-Channel17.satellite = 30
+Channel7.signal=B3
+Channel7.satellite = 29
+Channel8.signal=B3
+Channel8.satellite = 19
+Channel9.signal=B3
+Channel9.satellite = 20
+Channel10.signal=B3
+Channel10.satellite = 30
 
 
 ;######### ACQUISITION GLOBAL CONFIG ############
 ;# Acquisition config for BDS signals
-Acquisition_B1.implementation=BEIDOU_B1I_PCPS_Acquisition
-Acquisition_B1.item_type=gr_complex
-Acquisition_B1.coherent_integration_time_ms=1
-Acquisition_B1.threshold=0.0005
-Acquisition_B1.doppler_max=15000
-Acquisition_B1.doppler_step=100
-Acquisition_B1.dump=false
-Acquisition_B1.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/bds_b1i_acq
-Acquisition_B1.blocking=false;
-Acquisition_B1.use_CFAR_algorithm=true;
-Acquisition_B1.bit_transition_flag = false;
+Acquisition_B3.implementation=BEIDOU_B3I_PCPS_Acquisition
+Acquisition_B3.item_type=gr_complex
+Acquisition_B3.coherent_integration_time_ms=1
+Acquisition_B3.threshold=0.00025
+Acquisition_B3.doppler_max=15000
+Acquisition_B3.doppler_step=50
+Acquisition_B3.dump=false
+Acquisition_B3.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/bds_b1i_acq
+Acquisition_B3.blocking=false;
+Acquisition_B3.use_CFAR_algorithm=true;
+Acquisition_B3.bit_transition_flag = false;
 
 ;# Acquisition config for GPS signals
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
 Acquisition_1C.item_type=gr_complex
 Acquisition_1C.coherent_integration_time_ms=1
-Acquisition_1C.threshold=0.0005
+Acquisition_1C.threshold=0.001
 Acquisition_1C.doppler_max=15000
-Acquisition_1C.doppler_step=100
+Acquisition_1C.doppler_step=50
 Acquisition_1C.dump=true
 Acquisition_1C.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/gps_l1ca_acq
 Acquisition_1C.blocking=false;
 Acquisition_1C.use_CFAR_algorithm=true;
 Acquisition_1C.bit_transition_flag = false;
 
-;# Acquisition config for Galileo signals
-Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition
-Acquisition_1B.item_type=gr_complex
-Acquisition_1B.coherent_integration_time_ms=4
-Acquisition_1B.threshold=0.0015
-Acquisition_1B.doppler_max=15000
-Acquisition_1B.doppler_step=100
-Acquisition_1B.dump=true
-Acquisition_1B.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/gal_e1b_acq
-Acquisition_1B.blocking=false;
-Acquisition_1B.use_CFAR_algorithm=true;
-Acquisition_1B.bit_transition_flag = false;
-
 ;######### TRACKING GLOBAL CONFIG ############
-Tracking_B1.implementation=BEIDOU_B1I_DLL_PLL_Tracking
-Tracking_B1.item_type=gr_complex
-Tracking_B1.pll_bw_hz=25.0;
-Tracking_B1.dll_bw_hz=2.50;
-Tracking_B1.dump=true;
-Tracking_B1.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/bds_b1i_trk_ch_
+Tracking_B3.implementation=BEIDOU_B3I_DLL_PLL_Tracking
+Tracking_B3.item_type=gr_complex
+Tracking_B3.pll_bw_hz=25.0;
+Tracking_B3.dll_bw_hz=2.50;
+Tracking_B3.dump=true;
+Tracking_B3.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/bds_b1i_trk_ch_
 
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
@@ -222,23 +179,13 @@ Tracking_1C.dll_bw_hz=2.50;
 Tracking_1C.dump=true;
 Tracking_1C.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/gps_l1ca_trk_ch_
 
-Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
-Tracking_1B.item_type=gr_complex
-Tracking_1B.pll_bw_hz=25.0;
-Tracking_1B.dll_bw_hz=2.50;
-Tracking_1B.dump=true;
-Tracking_1B.dump_filename=/home/dmiralles/Documents/Research/Publications/INSIDE_GNSS/bds_leg_pvt/Data/gal_e1b_trk_ch_
-
 ;######### TELEMETRY DECODER GPS CONFIG ############
-TelemetryDecoder_B1.implementation=BEIDOU_B1I_Telemetry_Decoder
-TelemetryDecoder_B1.dump=false
+TelemetryDecoder_B3.implementation=BEIDOU_B3I_Telemetry_Decoder
+TelemetryDecoder_B3.dump=false
 
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
 
-TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
-TelemetryDecoder_1B.dump=false
-
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
 Observables.dump=true