added string substitutions