some changes in advance of completely reordering the entire body of this thing