more work and restructuring stuff