Updated replacing