Add to Partner Controller
prepare to merge.