Rearranged to put stuff where stuff should go.