reorganizing some