reorganizing a few things