diff --git a/mlprec/impl/mld_caggrmat_asb.f90 b/mlprec/impl/mld_caggrmat_asb.f90
index 39f9cf11..ba0bda60 100644
--- a/mlprec/impl/mld_caggrmat_asb.f90
+++ b/mlprec/impl/mld_caggrmat_asb.f90
@@ -133,26 +133,26 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf
 
   call psb_info(ictxt, me, np)
 
-  select case (p%parms%aggr_kind)
+  select case (parms%aggr_kind)
   case (mld_no_smooth_) 
 
     call mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,&
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_smooth_prol_) 
 
     call mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_biz_prol_) 
 
     call mld_caggrmat_biz_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_min_energy_) 
 
     call mld_caggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case default
     info = psb_err_internal_error_
diff --git a/mlprec/impl/mld_daggrmat_asb.f90 b/mlprec/impl/mld_daggrmat_asb.f90
index f8422b0f..5ee9b0e4 100644
--- a/mlprec/impl/mld_daggrmat_asb.f90
+++ b/mlprec/impl/mld_daggrmat_asb.f90
@@ -133,26 +133,26 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf
 
   call psb_info(ictxt, me, np)
 
-  select case (p%parms%aggr_kind)
+  select case (parms%aggr_kind)
   case (mld_no_smooth_) 
 
     call mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,&
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_smooth_prol_) 
 
     call mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_biz_prol_) 
 
     call mld_daggrmat_biz_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_min_energy_) 
 
     call mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case default
     info = psb_err_internal_error_
diff --git a/mlprec/impl/mld_saggrmat_asb.f90 b/mlprec/impl/mld_saggrmat_asb.f90
index bbee5a6f..e540c117 100644
--- a/mlprec/impl/mld_saggrmat_asb.f90
+++ b/mlprec/impl/mld_saggrmat_asb.f90
@@ -133,26 +133,26 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf
 
   call psb_info(ictxt, me, np)
 
-  select case (p%parms%aggr_kind)
+  select case (parms%aggr_kind)
   case (mld_no_smooth_) 
 
     call mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,&
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_smooth_prol_) 
 
     call mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_biz_prol_) 
 
     call mld_saggrmat_biz_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_min_energy_) 
 
     call mld_saggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case default
     info = psb_err_internal_error_
diff --git a/mlprec/impl/mld_zaggrmat_asb.f90 b/mlprec/impl/mld_zaggrmat_asb.f90
index 7a5cfeff..1cd620a5 100644
--- a/mlprec/impl/mld_zaggrmat_asb.f90
+++ b/mlprec/impl/mld_zaggrmat_asb.f90
@@ -133,26 +133,26 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf
 
   call psb_info(ictxt, me, np)
 
-  select case (p%parms%aggr_kind)
+  select case (parms%aggr_kind)
   case (mld_no_smooth_) 
 
     call mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,&
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_smooth_prol_) 
 
     call mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_biz_prol_) 
 
     call mld_zaggrmat_biz_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case(mld_min_energy_) 
 
     call mld_zaggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr, &
-         & p%parms,ac,op_prol,op_restr,info)
+         & parms,ac,op_prol,op_restr,info)
 
   case default
     info = psb_err_internal_error_
diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90
index 8073b94c..467a193c 100644
--- a/mlprec/mld_c_inner_mod.f90
+++ b/mlprec/mld_c_inner_mod.f90
@@ -149,7 +149,7 @@ module mld_c_inner_mod
       type(psb_cspmat_type), intent(out)  :: op_prol
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_c_lev_aggrmap_bld
-    subroutine mld_caggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,info)
+    subroutine mld_caggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,op_prol,info)
       use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_
       implicit none 
       integer(psb_ipk_), intent(in)     :: iorder
@@ -158,6 +158,7 @@ module mld_c_inner_mod
       type(psb_cspmat_type), intent(in) :: a
       type(psb_desc_type), intent(in)     :: desc_a
       integer(psb_ipk_), allocatable, intent(out) :: ilaggr(:),nlaggr(:)
+      type(psb_cspmat_type), intent(out)  :: op_prol        
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_caggrmap_bld
   end interface mld_aggrmap_bld
diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90
index 19eab0ca..6fc4c07a 100644
--- a/mlprec/mld_d_inner_mod.f90
+++ b/mlprec/mld_d_inner_mod.f90
@@ -149,7 +149,7 @@ module mld_d_inner_mod
       type(psb_dspmat_type), intent(out)  :: op_prol
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_d_lev_aggrmap_bld
-    subroutine mld_daggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,info)
+    subroutine mld_daggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,op_prol,info)
       use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_
       implicit none 
       integer(psb_ipk_), intent(in)     :: iorder
@@ -158,6 +158,7 @@ module mld_d_inner_mod
       type(psb_dspmat_type), intent(in) :: a
       type(psb_desc_type), intent(in)     :: desc_a
       integer(psb_ipk_), allocatable, intent(out) :: ilaggr(:),nlaggr(:)
+      type(psb_dspmat_type), intent(out)  :: op_prol        
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_daggrmap_bld
   end interface mld_aggrmap_bld
diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90
index 631a1a1f..279e45df 100644
--- a/mlprec/mld_s_inner_mod.f90
+++ b/mlprec/mld_s_inner_mod.f90
@@ -149,7 +149,7 @@ module mld_s_inner_mod
       type(psb_sspmat_type), intent(out)  :: op_prol
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_s_lev_aggrmap_bld
-    subroutine mld_saggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,info)
+    subroutine mld_saggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,op_prol,info)
       use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_
       implicit none 
       integer(psb_ipk_), intent(in)     :: iorder
@@ -158,6 +158,7 @@ module mld_s_inner_mod
       type(psb_sspmat_type), intent(in) :: a
       type(psb_desc_type), intent(in)     :: desc_a
       integer(psb_ipk_), allocatable, intent(out) :: ilaggr(:),nlaggr(:)
+      type(psb_sspmat_type), intent(out)  :: op_prol        
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_saggrmap_bld
   end interface mld_aggrmap_bld
diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90
index bf5d416a..72e64ac6 100644
--- a/mlprec/mld_z_inner_mod.f90
+++ b/mlprec/mld_z_inner_mod.f90
@@ -149,7 +149,7 @@ module mld_z_inner_mod
       type(psb_zspmat_type), intent(out)  :: op_prol
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_z_lev_aggrmap_bld
-    subroutine mld_zaggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,info)
+    subroutine mld_zaggrmap_bld(aggr_type,iorder,theta,a,desc_a,ilaggr,nlaggr,op_prol,info)
       use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_
       implicit none 
       integer(psb_ipk_), intent(in)     :: iorder
@@ -158,6 +158,7 @@ module mld_z_inner_mod
       type(psb_zspmat_type), intent(in) :: a
       type(psb_desc_type), intent(in)     :: desc_a
       integer(psb_ipk_), allocatable, intent(out) :: ilaggr(:),nlaggr(:)
+      type(psb_zspmat_type), intent(out)  :: op_prol        
       integer(psb_ipk_), intent(out)      :: info
     end subroutine mld_zaggrmap_bld
   end interface mld_aggrmap_bld