experiment with supporting cloning again