More work on clone.