Updated matrix sizing