updated substitutions