improve replacements