changed partner order and functions