Rethink flow of cloning