restructuring plus some more stuff