More replacements, getting there..