first clone and changes for cayenne 3.2