move a few things around
more rearrangements