restructured and completed some things