tweak clone logic