bit more reorganizing