Beijing:
India and China may be squabbling over Beijing's aid to Pakistan and the border but here in China, Yoga could be starting something new. The Yogi Yoga School founded by yoga guru Mohan Bhardari and his Chinese wife, Yin Yan twelve years ago already has 6,000 students in China.
Yin Yan, a former editor of the fashion magazine Elle, met Mohan on a trip to Rishikesh in 2003 and they never looked back. The annual turnover of their schools is over $10 million.
Many of their students will be at a yoga tai chi demonstration for PM Modi and the Chinese Premier at the Temple of Heaven in Beijing on May 15. It's a new kind of diplomacy that PM Modi is trying - soft diplomacy - of which yoga is a big part along with Modi's push for Buddhism and his decision to join the Chinese social media platform, Weibo.
Yin Yan, the founder and chairperson, Yogi Yoga says, "Yoga has helped Chinese people understand Indian civilisation and Indian people better. We welcome this emphasis on yoga".
"Yoga is hugely popular here now, especially among people in their 20s and 30s. PM Modi's initiative is really good because it helps the two countries understand each other," says Mr Bhadari.
Buddhism, which has grown hugely in China, is another part of the Indian government's new diplomacy.
PM Modi will be visiting the famous Wild Goose Pagoda in Xian with President Xi, the spiritual structure built to highlight the journey of the famous Chinese Buddhist monk Xuan Zang to India in 645 AD. An Indian and Chinese Memorandum of Understanding (MOU) will also be signed for a film on the monk.
And PM Modi's decision to join China's social media platform, Weibo, has been a hit; with over 47,000 followers though not all the comments are friendly with many making digs on Arunachal Pradesh being a part of China.
Dr Ren Yuanzhe, Associate Professor, Department of Diplomacy, China Foreign Affairs University says This soft diplomacy is welcome and going on Weibo was a smart move by Modi. Earlier David Cameron did it and people loved his pictures. This is a great new way to connect with Chinese people."
But with both countries still dealing with many contentious issues, how this new approach to diplomacy will work in the long run is still to be tested.