Refactored middle_man