merged partner changes and add more