rearranging a few things...