added other data types and rnd matrices