Revert matrix changes. They didn't work proprely