Removed matrix, it didn't work well anyway