Updated cloning so the popup stays