update to use faster clone (in the new code -- existing code not updated)