some additions about structure. But not final