More work on restructuring