Full matrix hack... almost working