Redo middle_man feature update