More work on clones and structures figure