Last try to get full matrix working