diff --git a/.gitignore b/.gitignore
index 597313e5..90e5ace7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 BLACS/INSTALL/cmake_install.cmake
 BLACS/INSTALL/Makefile
 BLACS/INSTALL/x*
-TESTING/x*
+TESTING/traditional/x*
 REDIST/TESTING/x*
 PBLAS/TESTING/x*
 PBLAS/TESTING/PB_Cabort.c
@@ -15,4 +15,5 @@ PBLAS/TIMING/PB_Cwarn.c
 BLACS/TESTING/xCbtest
 BLACS/TESTING/xFbtest
 SLmake.inc
+.DS_Store
 
diff --git a/BLACS/TESTING/Cbt.c b/BLACS/TESTING/Cbt.c
index 294409ff..6e48bcea 100644
--- a/BLACS/TESTING/Cbt.c
+++ b/BLACS/TESTING/Cbt.c
@@ -3,426 +3,426 @@
 
 void blacs_gridinit_(Int *ConTxt, char *order, Int *nprow, Int *npcol)
 {
-   void Cblacs_gridinit();
+   void Cblacs_gridinit( Int *ConTxt, char *order, Int nprow, Int npcol );
 
    Cblacs_gridinit(ConTxt, order, *nprow, *npcol);
 }
 
 void blacs_setup_(Int *mypnum, Int *nprocs)
 {
-   void Cblacs_setup();
+   void Cblacs_setup( Int *mypnum, Int *nprocs );
    Cblacs_setup(mypnum, nprocs);
 }
 
 void blacs_pinfo_(Int *mypnum, Int *nprocs)
 {
-   void Cblacs_pinfo();
+   void Cblacs_pinfo( Int *mypnum, Int *nprocs );
    Cblacs_pinfo(mypnum, nprocs);
 }
 
 void blacs_gridmap_(Int *ConTxt, Int *usermap, Int *ldup, Int *nprow, Int *npcol)
 {
-   void Cblacs_gridmap();
+   void Cblacs_gridmap( Int *ConTxt, Int *usermap, Int ldup, Int nprow, Int npcol );
    Cblacs_gridmap(ConTxt, usermap, *ldup, *nprow, *npcol);
 }
 
 void blacs_gridexit_(Int *ConTxt)
 {
-   void Cblacs_gridexit();
+   void Cblacs_gridexit( Int ConTxt );
    Cblacs_gridexit(*ConTxt);
 }
 
 void blacs_abort_(Int *ConTxt, Int *ErrNo)
 {
-   void Cblacs_abort();
+   void Cblacs_abort( Int ConTxt, Int ErrNo );
    Cblacs_abort(*ConTxt, *ErrNo);
 }
 
 void blacs_exit_(Int *NotDone)
 {
-   void Cblacs_exit();
+   void Cblacs_exit( Int NotDone );
    Cblacs_exit(*NotDone);
 }
 
 void blacs_freebuff_(Int *ConTxt, Int *Wait)
 {
-   void Cblacs_freebuff();
+   void Cblacs_freebuff( Int ConTxt, Int Wait );
    Cblacs_freebuff(*ConTxt, *Wait);
 }
 
 void blacs_gridinfo_(Int *ConTxt, Int *nprow, Int *npcol, Int *myrow, Int *mycol)
 {
-   void Cblacs_gridinfo();
+   void Cblacs_gridinfo( Int ConTxt, Int *nprow, Int *npcol, Int *myrow, Int *mycol );
    Cblacs_gridinfo(*ConTxt, nprow, npcol, myrow, mycol);
 }
 
 void blacs_barrier_(Int *ConTxt, char *scope)
 {
-   void Cblacs_barrier();
+   void Cblacs_barrier( Int ConTxt, char *scope );
    Cblacs_barrier(*ConTxt, scope);
 }
 
 Int blacs_pnum_(Int *ConTxt, Int *prow, Int *pcol)
 {
-   Int Cblacs_pnum();
+   Int Cblacs_pnum( Int ConTxt, Int prow, Int pcol );
    return( Cblacs_pnum(*ConTxt, *prow, *pcol) );
 }
 
 void blacs_pcoord_(Int *ConTxt, Int *nodenum, Int *prow, Int *pcol)
 {
-   void Cblacs_pcoord();
+   void Cblacs_pcoord( Int ConTxt, Int nodenum, Int *prow, Int *pcol );
    Cblacs_pcoord(*ConTxt, *nodenum, prow, pcol);
 }
 
 void blacs_get_(Int *ConTxt, Int *what, Int *I)
 {
-   void Cblacs_get();
+   void Cblacs_get( Int ConTxt, Int what, Int *I );
    Cblacs_get(*ConTxt, *what, I);
 }
 
 void blacs_set_(Int *ConTxt, Int *what, Int *I)
 {
-   void Cblacs_set();
+   void Cblacs_set( Int ConTxt, Int what, Int *I );
    Cblacs_set(*ConTxt, *what, I);
 }
 
 
 void igesd2d_(Int *ConTxt, Int *m, Int *n, Int *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cigesd2d();
+   void Cigesd2d( Int ConTxt, Int m, Int n, Int *A, Int lda, Int rdest, Int cdest );
    Cigesd2d(*ConTxt, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void igerv2d_(Int *ConTxt, Int *m, Int *n, Int *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cigerv2d();
+   void Cigerv2d( Int ConTxt, Int m, Int n, Int *A, Int lda, Int rsrc, Int csrc );
    Cigerv2d(*ConTxt, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void igebs2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, Int *A, Int *lda)
 {
-   void Cigebs2d();
+   void Cigebs2d( Int ConTxt, char *scope, char *top, Int m, Int n, Int *A, Int lda );
    Cigebs2d(*ConTxt, scope, top, *m, *n, A, *lda);
 }
 
 void igebr2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, Int *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cigebr2d();
+   void Cigebr2d( Int ConTxt, char *scope, char *top, Int m, Int n, Int *A, Int lda, Int rsrc, Int csrc );
    Cigebr2d(*ConTxt, scope, top, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void itrsd2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, Int *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Citrsd2d();
+   void Citrsd2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, Int *A, Int lda, Int rdest, Int cdest );
    Citrsd2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void itrrv2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, Int *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Citrrv2d();
+   void Citrrv2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, Int *A, Int lda, Int rsrc, Int csrc );
    Citrrv2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void itrbs2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, Int *A, Int *lda)
 {
-   void Citrbs2d();
+   void Citrbs2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, Int *A, Int lda );
    Citrbs2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda);
 }
 
 void itrbr2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, Int *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Citrbr2d();
+   void Citrbr2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, Int *A, Int lda, Int rsrc, Int csrc );
    Citrbr2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void igsum2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, Int *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cigsum2d();
+   void Cigsum2d( Int ConTxt, char *scope, char *top, Int m, Int n, Int *A, Int lda, Int rdest, Int cdest );
    Cigsum2d(*ConTxt, scope, top, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void igamx2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, Int *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Cigamx2d();
+   void Cigamx2d( Int ConTxt, char *scope, char *top, Int m, Int n, Int *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Cigamx2d(*ConTxt, scope, top, *m, *n, A, *lda,  rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void igamn2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, Int *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Cigamn2d();
+   void Cigamn2d( Int ConTxt, char *scope, char *top, Int m, Int n, Int *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Cigamn2d(*ConTxt, scope, top, *m, *n, A, *lda, rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void dgesd2d_(Int *ConTxt, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cdgesd2d();
+   void Cdgesd2d( Int ConTxt, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Cdgesd2d(*ConTxt, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void dgerv2d_(Int *ConTxt, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cdgerv2d();
+   void Cdgerv2d( Int ConTxt, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cdgerv2d(*ConTxt, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void dgebs2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda)
 {
-   void Cdgebs2d();
+   void Cdgebs2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda );
    Cdgebs2d(*ConTxt, scope, top, *m, *n, A, *lda);
 }
 
 void dgebr2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cdgebr2d();
+   void Cdgebr2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cdgebr2d(*ConTxt, scope, top, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void dtrsd2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cdtrsd2d();
+   void Cdtrsd2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Cdtrsd2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void dtrrv2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cdtrrv2d();
+   void Cdtrrv2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cdtrrv2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void dtrbs2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda)
 {
-   void Cdtrbs2d();
+   void Cdtrbs2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, double *A, Int lda );
    Cdtrbs2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda);
 }
 
 void dtrbr2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cdtrbr2d();
+   void Cdtrbr2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cdtrbr2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void dgsum2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cdgsum2d();
+   void Cdgsum2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Cdgsum2d(*ConTxt, scope, top, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void dgamx2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Cdgamx2d();
+   void Cdgamx2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Cdgamx2d(*ConTxt, scope, top, *m, *n, A, *lda,  rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void dgamn2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Cdgamn2d();
+   void Cdgamn2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Cdgamn2d(*ConTxt, scope, top, *m, *n, A, *lda, rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void sgesd2d_(Int *ConTxt, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Csgesd2d();
+   void Csgesd2d( Int ConTxt, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Csgesd2d(*ConTxt, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void sgerv2d_(Int *ConTxt, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Csgerv2d();
+   void Csgerv2d( Int ConTxt, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Csgerv2d(*ConTxt, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void sgebs2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda)
 {
-   void Csgebs2d();
+   void Csgebs2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda );
    Csgebs2d(*ConTxt, scope, top, *m, *n, A, *lda);
 }
 
 void sgebr2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Csgebr2d();
+   void Csgebr2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Csgebr2d(*ConTxt, scope, top, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void strsd2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cstrsd2d();
+   void Cstrsd2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Cstrsd2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void strrv2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cstrrv2d();
+   void Cstrrv2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Cstrrv2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void strbs2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda)
 {
-   void Cstrbs2d();
+   void Cstrbs2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, float *A, Int lda );
    Cstrbs2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda);
 }
 
 void strbr2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cstrbr2d();
+   void Cstrbr2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Cstrbr2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void sgsum2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Csgsum2d();
+   void Csgsum2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Csgsum2d(*ConTxt, scope, top, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void sgamx2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Csgamx2d();
+   void Csgamx2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Csgamx2d(*ConTxt, scope, top, *m, *n, A, *lda,  rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void sgamn2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Csgamn2d();
+   void Csgamn2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Csgamn2d(*ConTxt, scope, top, *m, *n, A, *lda, rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void cgesd2d_(Int *ConTxt, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Ccgesd2d();
+   void Ccgesd2d( Int ConTxt, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Ccgesd2d(*ConTxt, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void cgerv2d_(Int *ConTxt, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Ccgerv2d();
+   void Ccgerv2d( Int ConTxt, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Ccgerv2d(*ConTxt, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void cgebs2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda)
 {
-   void Ccgebs2d();
+   void Ccgebs2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda );
    Ccgebs2d(*ConTxt, scope, top, *m, *n, A, *lda);
 }
 
 void cgebr2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Ccgebr2d();
+   void Ccgebr2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Ccgebr2d(*ConTxt, scope, top, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void ctrsd2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cctrsd2d();
+   void Cctrsd2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Cctrsd2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void ctrrv2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cctrrv2d();
+   void Cctrrv2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Cctrrv2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void ctrbs2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda)
 {
-   void Cctrbs2d();
+   void Cctrbs2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, float *A, Int lda );
    Cctrbs2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda);
 }
 
 void ctrbr2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, float *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cctrbr2d();
+   void Cctrbr2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, float *A, Int lda, Int rsrc, Int csrc );
    Cctrbr2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void cgsum2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Ccgsum2d();
+   void Ccgsum2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int rdest, Int cdest );
    Ccgsum2d(*ConTxt, scope, top, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void cgamx2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Ccgamx2d();
+   void Ccgamx2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Ccgamx2d(*ConTxt, scope, top, *m, *n, A, *lda,  rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void cgamn2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, float *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Ccgamn2d();
+   void Ccgamn2d( Int ConTxt, char *scope, char *top, Int m, Int n, float *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Ccgamn2d(*ConTxt, scope, top, *m, *n, A, *lda, rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void zgesd2d_(Int *ConTxt, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Czgesd2d();
+   void Czgesd2d( Int ConTxt, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Czgesd2d(*ConTxt, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void zgerv2d_(Int *ConTxt, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Czgerv2d();
+   void Czgerv2d( Int ConTxt, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Czgerv2d(*ConTxt, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void zgebs2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda)
 {
-   void Czgebs2d();
+   void Czgebs2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda );
    Czgebs2d(*ConTxt, scope, top, *m, *n, A, *lda);
 }
 
 void zgebr2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Czgebr2d();
+   void Czgebr2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Czgebr2d(*ConTxt, scope, top, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void ztrsd2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Cztrsd2d();
+   void Cztrsd2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Cztrsd2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void ztrrv2d_(Int *ConTxt, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cztrrv2d();
+   void Cztrrv2d( Int ConTxt, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cztrrv2d(*ConTxt, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void ztrbs2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda)
 {
-   void Cztrbs2d();
+   void Cztrbs2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, double *A, Int lda );
    Cztrbs2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda);
 }
 
 void ztrbr2d_(Int *ConTxt, char *scope, char *top, char *uplo, char *diag, Int *m, Int *n, double *A, Int *lda, Int *rsrc, Int *csrc)
 {
-   void Cztrbr2d();
+   void Cztrbr2d( Int ConTxt, char *scope, char *top, char *uplo, char *diag, Int m, Int n, double *A, Int lda, Int rsrc, Int csrc );
    Cztrbr2d(*ConTxt, scope, top, uplo, diag, *m, *n, A, *lda, *rsrc, *csrc);
 }
 
 void zgsum2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rdest, Int *cdest)
 {
-   void Czgsum2d();
+   void Czgsum2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int rdest, Int cdest );
    Czgsum2d(*ConTxt, scope, top, *m, *n, A, *lda, *rdest, *cdest);
 }
 
 void zgamx2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Czgamx2d();
+   void Czgamx2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Czgamx2d(*ConTxt, scope, top, *m, *n, A, *lda,  rA, cA, *ldia,
             *rdest, *cdest);
 }
 
 void zgamn2d_(Int *ConTxt, char *scope, char *top, Int *m, Int *n, double *A, Int *lda, Int *rA, Int *cA, Int *ldia, Int *rdest, Int *cdest)
 {
-   void Czgamn2d();
+   void Czgamn2d( Int ConTxt, char *scope, char *top, Int m, Int n, double *A, Int lda, Int *rA, Int *cA, Int ldia, Int rdest, Int cdest );
    Czgamn2d(*ConTxt, scope, top, *m, *n, A, *lda, rA, cA, *ldia,
             *rdest, *cdest);
 }
diff --git a/REDIST/TESTING/pcgemrdrv.c b/REDIST/TESTING/pcgemrdrv.c
index 0803fc7c..a78125e5 100644
--- a/REDIST/TESTING/pcgemrdrv.c
+++ b/REDIST/TESTING/pcgemrdrv.c
@@ -105,52 +105,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Ccgesd2d();
-extern void Ccgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  clacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 cgescanD0
-#define dispmat cgedispmat
 #define setmemory cgesetmemory
 #define freememory cgefreememory
-#define scan_intervals cgescan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpcgemr2do();
-extern void Cpcgemr2d();
-/* some defines for Cpcgemr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( complex** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpcgemr2d( Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pctrmrdrv.c b/REDIST/TESTING/pctrmrdrv.c
index 6df949ef..467ff209 100644
--- a/REDIST/TESTING/pctrmrdrv.c
+++ b/REDIST/TESTING/pctrmrdrv.c
@@ -105,52 +105,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Ccgesd2d();
-extern void Ccgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  clacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 ctrscanD0
-#define dispmat ctrdispmat
 #define setmemory ctrsetmemory
 #define freememory ctrfreememory
-#define scan_intervals ctrscan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpctrmr2do();
-extern void Cpctrmr2d();
-/* some defines for Cpctrmr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( complex** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpctrmr2d( char* uplo, char* diag, Int m, Int n, complex *ptrmyblock, Int ia, Int ja, MDESC *ma, complex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pdgemrdrv.c b/REDIST/TESTING/pdgemrdrv.c
index 51149046..702bad40 100644
--- a/REDIST/TESTING/pdgemrdrv.c
+++ b/REDIST/TESTING/pdgemrdrv.c
@@ -102,52 +102,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Cdgesd2d();
-extern void Cdgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  dlacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 dgescanD0
-#define dispmat dgedispmat
 #define setmemory dgesetmemory
 #define freememory dgefreememory
-#define scan_intervals dgescan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpdgemr2do();
-extern void Cpdgemr2d();
-/* some defines for Cpdgemr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( double** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpdgemr2d( Int m, Int n, double *ptrmyblock, Int ia, Int ja, MDESC *ma, double *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pdtrmrdrv.c b/REDIST/TESTING/pdtrmrdrv.c
index 6c2a05c9..d25a6e71 100644
--- a/REDIST/TESTING/pdtrmrdrv.c
+++ b/REDIST/TESTING/pdtrmrdrv.c
@@ -102,52 +102,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Cdgesd2d();
-extern void Cdgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  dlacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 dtrscanD0
-#define dispmat dtrdispmat
 #define setmemory dtrsetmemory
 #define freememory dtrfreememory
-#define scan_intervals dtrscan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpdtrmr2do();
-extern void Cpdtrmr2d();
-/* some defines for Cpdtrmr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( double** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpdtrmr2d( char* uplo, char* diag, Int m, Int n, double *ptrmyblock, Int ia, Int ja, MDESC *ma, double *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pigemrdrv.c b/REDIST/TESTING/pigemrdrv.c
index 05e0c78e..50ed0588 100644
--- a/REDIST/TESTING/pigemrdrv.c
+++ b/REDIST/TESTING/pigemrdrv.c
@@ -101,52 +101,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  ilacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 igescanD0
-#define dispmat igedispmat
 #define setmemory igesetmemory
 #define freememory igefreememory
-#define scan_intervals igescan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpigemr2do();
-extern void Cpigemr2d();
-/* some defines for Cpigemr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( Int** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpigemr2d( Int m, Int n, Int *ptrmyblock, Int ia, Int ja, MDESC *ma, Int *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pitrmrdrv.c b/REDIST/TESTING/pitrmrdrv.c
index e1945c25..43bf6136 100644
--- a/REDIST/TESTING/pitrmrdrv.c
+++ b/REDIST/TESTING/pitrmrdrv.c
@@ -101,52 +101,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  ilacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 itrscanD0
-#define dispmat itrdispmat
 #define setmemory itrsetmemory
 #define freememory itrfreememory
-#define scan_intervals itrscan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpitrmr2do();
-extern void Cpitrmr2d();
-/* some defines for Cpitrmr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( Int** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpitrmr2d( char* uplo, char* diag, Int m, Int n, Int *ptrmyblock, Int ia, Int ja, MDESC *ma, Int *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/psgemrdrv.c b/REDIST/TESTING/psgemrdrv.c
index f9a98f0a..370b297e 100644
--- a/REDIST/TESTING/psgemrdrv.c
+++ b/REDIST/TESTING/psgemrdrv.c
@@ -101,52 +101,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Csgesd2d();
-extern void Csgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  slacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 sgescanD0
-#define dispmat sgedispmat
 #define setmemory sgesetmemory
 #define freememory sgefreememory
-#define scan_intervals sgescan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpsgemr2do();
-extern void Cpsgemr2d();
-/* some defines for Cpsgemr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( float** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpsgemr2d( Int m, Int n, float *ptrmyblock, Int ia, Int ja, MDESC *ma, float *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pstrmrdrv.c b/REDIST/TESTING/pstrmrdrv.c
index 1e836d4d..92b66e52 100644
--- a/REDIST/TESTING/pstrmrdrv.c
+++ b/REDIST/TESTING/pstrmrdrv.c
@@ -101,52 +101,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Csgesd2d();
-extern void Csgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  slacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 strscanD0
-#define dispmat strdispmat
 #define setmemory strsetmemory
 #define freememory strfreememory
-#define scan_intervals strscan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpstrmr2do();
-extern void Cpstrmr2d();
-/* some defines for Cpstrmr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( float** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpstrmr2d( char* uplo, char* diag, Int m, Int n, float *ptrmyblock, Int ia, Int ja, MDESC *ma, float *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pzgemrdrv.c b/REDIST/TESTING/pzgemrdrv.c
index e41ffeaa..ba43d995 100644
--- a/REDIST/TESTING/pzgemrdrv.c
+++ b/REDIST/TESTING/pzgemrdrv.c
@@ -105,52 +105,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Czgesd2d();
-extern void Czgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  zlacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 zgescanD0
-#define dispmat zgedispmat
 #define setmemory zgesetmemory
 #define freememory zgefreememory
-#define scan_intervals zgescan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpzgemr2do();
-extern void Cpzgemr2d();
-/* some defines for Cpzgemr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( dcomplex** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpzgemr2d( Int m, Int n, dcomplex *ptrmyblock, Int ia, Int ja, MDESC *ma, dcomplex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/REDIST/TESTING/pztrmrdrv.c b/REDIST/TESTING/pztrmrdrv.c
index 1089a99f..40a26d98 100644
--- a/REDIST/TESTING/pztrmrdrv.c
+++ b/REDIST/TESTING/pztrmrdrv.c
@@ -105,52 +105,27 @@ typedef struct {
 #define realloc myrealloc
 #endif
 /* Cblacs */
-extern void Cblacs_pcoord();
-extern Int Cblacs_pnum();
-extern void Csetpvmtids();
-extern void Cblacs_get();
-extern void Cblacs_pinfo();
-extern void Cblacs_gridinfo();
-extern void Cblacs_gridinit();
-extern void Cblacs_exit();
-extern void Cblacs_gridexit();
-extern void Cblacs_setup();
-extern void Cigebs2d();
-extern void Cigebr2d();
-extern void Cigesd2d();
-extern void Cigerv2d();
-extern void Cigsum2d();
-extern void Cigamn2d();
-extern void Cigamx2d();
-extern void Czgesd2d();
-extern void Czgerv2d();
+extern void Cblacs_get( Int context, Int what, Int* val );
+extern void Cblacs_pinfo( Int* mypnum, Int* nprocs );
+extern void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+extern void Cblacs_gridinit( Int* context, char* order, Int nprow, Int npcol );
+extern void Cblacs_exit( Int continue_blacs );
+extern void Cblacs_gridexit( Int context );
+extern void Cblacs_setup( Int* mypnum, Int* nprocs );
+extern void Cigebs2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda );
+extern void Cigebr2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rsrc, Int csrc );
+extern void Cigsum2d( Int context, char* scope, char* top, Int m, Int n, Int* A, Int lda, Int rdest, Int cdest );
 /* lapack */
 void  zlacpy_();
 /* aux fonctions */
-extern Int localindice();
-extern void *mr2d_malloc();
-extern Int ppcm();
-extern Int localsize();
-extern Int memoryblocksize();
-extern Int changeorigin();
-extern void paramcheck();
+extern Int localsize( Int myprow, Int p, Int nbrow, Int m );
+extern Int memoryblocksize( MDESC *a );
 /* tools and others function */
-#define scanD0 ztrscanD0
-#define dispmat ztrdispmat
 #define setmemory ztrsetmemory
 #define freememory ztrfreememory
-#define scan_intervals ztrscan_intervals
-extern void scanD0();
-extern void dispmat();
-extern void setmemory();
-extern void freememory();
-extern Int scan_intervals();
-extern void Cpztrmr2do();
-extern void Cpztrmr2d();
-/* some defines for Cpztrmr2do */
-#define SENDBUFF 0
-#define RECVBUFF 1
-#define SIZEBUFF 2
+extern void setmemory( dcomplex** ptr, Int size );
+extern void freememory( char* ptr );
+extern void Cpztrmr2d( char* uplo, char* diag, Int m, Int n, dcomplex *ptrmyblock, Int ia, Int ja, MDESC *ma, dcomplex *ptrmynewblock, Int ib, Int jb, MDESC *mb, Int globcontext );
 #if 0
 #define DEBUG
 #endif
diff --git a/SLmake.inc.example b/SLmake.inc.example
index 3a867c3b..b24dbcea 100644
--- a/SLmake.inc.example
+++ b/SLmake.inc.example
@@ -28,8 +28,8 @@ CDEFS         = -DAdd_
 
 FC            = mpif90
 CC            = mpicc 
-NOOPT         = -O0
-FCFLAGS       = -O3
+NOOPT         = -O0 -fallow-argument-mismatch
+FCFLAGS       = -O3 -fallow-argument-mismatch
 CCFLAGS       = -O3
 FCLOADER      = $(FC)
 CCLOADER      = $(CC)
diff --git a/TOOLS/SL_gridreshape.c b/TOOLS/SL_gridreshape.c
index 2dd7958f..3b95f977 100644
--- a/TOOLS/SL_gridreshape.c
+++ b/TOOLS/SL_gridreshape.c
@@ -7,6 +7,10 @@
 
 Int SL_Cgridreshape(Int ctxt, Int pstart, Int row_major_in, Int row_major_out, Int P, Int Q)
 {
+   void Cblacs_gridinfo( Int context, Int* nprow, Int* npcol, Int* myrow, Int* mycol );
+   void Cblacs_abort( Int ConTxt, Int ErrNo );
+   void Cblacs_get( Int context, Int what, Int * val );
+   void Cblacs_gridmap( Int* context, Int* usermap, Int ldumap, Int nprow, Int npcol );
    Int Cblacs_pnum( Int context, Int prow, Int pcol );
    Int nctxt, P0, Q0, Np, i, *g;