reorganizing some things