Updated to match dofst_k