Updated substitution to track .K