added further replacements