Replacing mechanism changed (not tested properly)