more reorganization and deletion