Clone class is looking better