added more replacements