added substitutions