more restructing