stashed addOrderToMat
merge fixed