Partner controller improved