a little more reorganization