more cloning changes...
more work in cloning