Xiamen dialect, sometimes known as Amoy, is the main dialect spoken in the Chinese city of Xiamen and its surrounding regions of Tong'an and Xiang'an, both of which are now included in the Greater Xiamen area. What area now includes Tong'an and Xiang'an?