Added matrix structure .. forgot in first commit