finalized restructure