diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 5371b530..75743ab3 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(PSB_base_source_files
   comm/psb_dovrl_a.f90
   comm/psb_dovrl.f90
-#  comm/psb_i2halo_a.f90
+  comm/psb_i2halo_a.f90
   comm/internals/psi_zswaptran.F90
-#  comm/internals/psi_i2ovrl_upd_a.f90
+  comm/internals/psi_i2ovrl_upd_a.f90
   comm/internals/psi_lovrl_save.f90
   comm/internals/psi_movrl_save_a.f90
   comm/internals/psi_sovrl_restr_a.f90
@@ -16,7 +16,7 @@ set(PSB_base_source_files
   comm/internals/psi_lovrl_upd.f90
   comm/internals/psi_dswapdata_a.F90
   comm/internals/psi_movrl_upd_a.f90
-#  comm/internals/psi_i2swaptran_a.F90
+  comm/internals/psi_i2swaptran_a.F90
   comm/internals/psi_dswaptran.F90
   comm/internals/psi_covrl_save_a.f90
   comm/internals/psi_eovrl_restr_a.f90
@@ -31,7 +31,7 @@ set(PSB_base_source_files
   comm/internals/psi_sswaptran.F90
   comm/internals/psi_lswaptran.F90
   comm/internals/psi_mswaptran_a.F90
-#  comm/internals/psi_i2ovrl_restr_a.f90
+  comm/internals/psi_i2ovrl_restr_a.f90
   comm/internals/psi_covrl_restr.f90
   comm/internals/psi_mswapdata_a.F90
   comm/internals/psi_zovrl_restr_a.f90
@@ -49,14 +49,14 @@ set(PSB_base_source_files
   comm/internals/psi_zswapdata_a.F90
   comm/internals/psi_dovrl_save.f90
   comm/internals/psi_covrl_save.f90
-#  comm/internals/psi_i2swapdata_a.F90
+  comm/internals/psi_i2swapdata_a.F90
   comm/internals/psi_dovrl_upd.f90
   comm/internals/psi_eovrl_save_a.f90
   comm/internals/psi_zovrl_upd_a.f90
   comm/internals/psi_zswapdata.F90
   comm/internals/psi_covrl_upd.f90
   comm/internals/psi_cswaptran.F90
-#  comm/internals/psi_i2ovrl_save_a.f90
+  comm/internals/psi_i2ovrl_save_a.f90
   comm/internals/psi_sovrl_upd.f90
   comm/internals/psi_eswapdata_a.F90
   comm/internals/psi_movrl_restr_a.f90
@@ -82,9 +82,9 @@ set(PSB_base_source_files
   comm/psb_zhalo.f90
   comm/psb_movrl_a.f90
   comm/psb_chalo_a.f90
-#  comm/psb_i2scatter_a.F90
+  comm/psb_i2scatter_a.F90
   comm/psb_sgather_a.f90
-#  comm/psb_i2ovrl_a.f90
+  comm/psb_i2ovrl_a.f90
   comm/psb_zovrl_a.f90
   comm/psb_covrl.f90
   comm/psb_shalo.f90
@@ -100,7 +100,7 @@ set(PSB_base_source_files
   comm/psb_zhalo_a.f90
   comm/psb_sscatter_a.F90
   comm/psb_lscatter.F90
-#  comm/psb_i2gather_a.f90
+  comm/psb_i2gather_a.f90
   comm/psb_ihalo.f90
   comm/psb_iovrl.f90
   comm/psb_zspgather.F90
@@ -144,7 +144,7 @@ set(PSB_base_source_files
   tools/psb_sins.f90
   tools/psb_zspasb.f90
   tools/psb_zspalloc.f90
-#  tools/psb_i2_remote_vect.F90
+  tools/psb_i2_remote_vect.F90
   tools/psb_sfree_a.f90
   tools/psb_cdprt.f90
   tools/psb_c_glob_transpose.F90
@@ -160,7 +160,7 @@ set(PSB_base_source_files
   tools/psb_zallc_a.f90
   tools/psb_d_map.f90
   tools/psb_lfree.f90
-#  tools/psb_i2ins_a.f90
+  tools/psb_i2ins_a.f90
   tools/psb_s_remap.F90
   tools/psb_cspalloc.f90
   tools/psb_glob_to_loc.f90
@@ -177,9 +177,9 @@ set(PSB_base_source_files
   tools/psb_sgetelem.f90
   tools/psb_cspfree.f90
   tools/psb_cins.f90
-#  tools/psb_i2free_a.f90
+  tools/psb_i2free_a.f90
   tools/psb_dspins.F90
-#  tools/psb_i2asb_a.f90
+  tools/psb_i2asb_a.f90
   tools/psb_dsphalo.F90
   tools/psb_d_glob_transpose.F90
   tools/psb_c_par_csr_spspmm.f90
@@ -265,7 +265,7 @@ set(PSB_base_source_files
   tools/psb_zspins.F90
   tools/psb_zins_a.f90
   tools/psb_cdcpy.F90
-#  tools/psb_i2allc_a.f90
+  tools/psb_i2allc_a.f90
   tools/psb_dallc.f90
   tools/psb_cd_renum_block.F90
   tools/psb_dasb_a.f90
@@ -351,7 +351,7 @@ set(PSB_base_source_files
   serial/psb_ssymbmm.f90
   serial/psb_cgeprt.f90
   serial/psb_sgeprt.f90
-#  serial/psi_i2_serial_impl.F90
+  serial/psi_i2_serial_impl.F90
   serial/psi_e_serial_impl.F90
   serial/psb_zsymbmm.f90
   serial/psb_cspspmm.F90
@@ -430,11 +430,10 @@ set(PSB_base_source_files
   psblas/psb_cinv_vect.f90
   psblas/psb_zasum.f90
   modules/comm/psi_z_comm_v_mod.f90
-#  modules/comm/psb_i2_comm_a_mod.f90
-  modules/comm/psb_m_comm_a_mod.f90
+  modules/comm/psb_m_comm_a_mod.f90	
   modules/comm/psb_z_linmap_mod.f90
   modules/comm/psi_s_comm_a_mod.f90
-  modules/comm/psi_i2_comm_a_mod.f90
+  modules/comm/psb_i2_comm_a_mod.f90
   modules/comm/psi_m_comm_a_mod.f90
   modules/comm/psi_l_comm_v_mod.f90
   modules/comm/psb_comm_mod.f90
@@ -462,7 +461,7 @@ set(PSB_base_source_files
   modules/comm/psb_linmap_mod.f90
   modules/comm/psb_z_comm_a_mod.f90
   modules/comm/psi_c_comm_a_mod.f90
-#  modules/auxil/psb_i2_isort_mod.f90
+  modules/auxil/psb_i2_isort_mod.f90
   modules/auxil/psb_z_ip_reord_mod.F90
   modules/auxil/psi_s_serial_mod.f90
   modules/auxil/psb_s_hsort_x_mod.f90
@@ -470,7 +469,7 @@ set(PSB_base_source_files
   modules/auxil/psb_d_hsort_mod.f90
   modules/auxil/psi_alcx_mod.f90
   modules/auxil/psb_e_ip_reord_mod.F90
-#  modules/auxil/psb_i2_msort_mod.f90
+  modules/auxil/psb_i2_msort_mod.f90
   modules/auxil/psb_rb_idx_tree_mod.f90
   modules/auxil/psb_m_isort_mod.f90
   modules/auxil/psb_e_msort_mod.f90
@@ -489,14 +488,15 @@ set(PSB_base_source_files
   modules/auxil/psb_z_isort_mod.f90
   modules/auxil/psb_e_hsort_mod.f90
   modules/auxil/psi_m_serial_mod.f90
-#  modules/auxil/psi_i2_serial_mod.f90
+  modules/auxil/psi_i2_serial_mod.f90
+  modules/auxil/psb_i2_hsort_x_mod.f90
   modules/auxil/psb_s_isort_mod.f90
   modules/auxil/psb_e_realloc_mod.F90
   modules/auxil/psb_c_hsort_mod.f90
   modules/auxil/psb_z_msort_mod.f90
   modules/auxil/psi_d_serial_mod.f90
   modules/auxil/psb_z_qsort_mod.f90
-#  modules/auxil/psb_i2_hsort_mod.f90
+  modules/auxil/psb_i2_hsort_mod.f90
   modules/auxil/psb_m_msort_mod.f90
   modules/auxil/psb_m_ip_reord_mod.F90
   modules/auxil/psb_string_mod.f90
@@ -509,14 +509,14 @@ set(PSB_base_source_files
   modules/auxil/psb_m_hsort_mod.f90
   modules/auxil/psb_z_realloc_mod.F90
   modules/auxil/psb_z_rb_idx_tree_mod.f90
-#  modules/auxil/psb_i2_ip_reord_mod.F90
-#  modules/auxil/psb_i2_realloc_mod.F90
+  modules/auxil/psb_i2_ip_reord_mod.F90
+  modules/auxil/psb_i2_realloc_mod.F90
   modules/auxil/psb_s_rb_idx_tree_mod.f90
   modules/auxil/psb_c_hsort_x_mod.f90
   modules/auxil/psb_s_ip_reord_mod.F90
   modules/auxil/psb_d_isort_mod.f90
   modules/auxil/psi_z_serial_mod.f90
-#  modules/auxil/psb_i2_qsort_mod.f90
+  modules/auxil/psb_i2_qsort_mod.f90
   modules/auxil/psb_d_msort_mod.f90
   modules/auxil/psb_c_qsort_mod.f90
   modules/auxil/psb_z_hsort_x_mod.f90
@@ -533,7 +533,7 @@ set(PSB_base_source_files
   modules/psi_l_mod.F90
   modules/penv/psi_d_collective_mod.F90
   modules/penv/psi_m_p2p_mod.F90
-#  modules/penv/psi_i2_collective_mod.F90
+  modules/penv/psi_i2_collective_mod.F90
   modules/penv/psi_s_p2p_mod.F90
   modules/penv/psi_e_p2p_mod.F90
   modules/penv/psi_m_collective_mod.F90
@@ -543,7 +543,7 @@ set(PSB_base_source_files
   modules/penv/psi_z_p2p_mod.F90
   modules/penv/psi_c_collective_mod.F90
   modules/penv/psi_collective_mod.F90
-#  modules/penv/psi_i2_p2p_mod.F90
+  modules/penv/psi_i2_p2p_mod.F90
   modules/penv/psi_c_p2p_mod.F90
   modules/penv/psi_e_collective_mod.F90
   modules/penv/psi_z_collective_mod.F90
@@ -562,7 +562,7 @@ set(PSB_base_source_files
   modules/tools/psb_d_tools_mod.F90
   modules/tools/psb_c_tools_mod.F90
   modules/tools/psb_e_tools_a_mod.f90
-#  modules/tools/psb_i2_tools_a_mod.f90
+  modules/tools/psb_i2_tools_a_mod.f90
   modules/tools/psb_c_tools_a_mod.f90
   modules/tools/psb_z_tools_mod.F90
   modules/tools/psb_l_tools_mod.F90
@@ -588,6 +588,7 @@ set(PSB_base_source_files
   modules/serial/psb_s_base_mat_mod.F90
   modules/serial/psb_base_mat_mod.F90
   modules/serial/psb_i_base_vect_mod.F90
+  modules/serial/psb_i2_base_vect_mod.F90
   modules/serial/psb_s_vect_mod.F90
   modules/serial/psb_s_base_vect_mod.F90
   modules/serial/psb_d_base_vect_mod.F90
@@ -596,7 +597,8 @@ set(PSB_base_source_files
   modules/serial/psb_c_vect_mod.F90
   modules/serial/psb_d_mat_mod.F90
   modules/serial/psb_s_mat_mod.F90
-  modules/serial/psb_i_vect_mod.F90
+  modules/serial/psb_i2_vect_mod.F90
+  modules/serial/psb_i_vect_mod.F90	
   modules/serial/psb_d_vect_mod.F90
   modules/serial/psb_c_base_vect_mod.F90
   modules/serial/psb_vect_mod.f90