Finished fixing cloning