updated full structure