Border Disputes with China: An Update