Just exploring options to fix henchman