a bit more reorganization