Replacements improvements