restructure nearly finished