further opimization of matrix build