even more reorganizing