several changes and restructuring