Structure reviewed after talk with Fabrizio