1.5

Use struct instead of matrix