Need a better solution for matrixes....