rearranging a few things to make better logical sense.