US79445: moving stuff around to accomodate v3 documentation