Get clone working better