Added capability to change the partner