Which James Bond Movies Were Filmed in Thailand?

To date, there have been two James Bond movies which were filmed partially in Thailand. The first was "The Man With The Golden Gun" which was shot in Bangkok and Southern Thailand in 1974. The second was "Tomorrow Never Dies" which included shots in Phang Nga Bay nearby the location of James Bond Island.