General Improvements and restructuring