hopefully accounts for matrix changes