reorganization and updates