Replaced with new, quick, tabulation-based, matrix-based code