Change to tuple, and Remove clone operation