Replace update

Experimental **do not merge**