Updating now has its own URL cloning logic