+ minor restructuring