restructuring some more