In early 1954, Bảo Đại offered Diệm the position of Prime Minister in the new government in Vietnam. In May 1954, the French surrendered at Điện Biên Phủ and the Geneva Conference began in April 1954. On 16 June 1954, Diệm met with Bảo Đại in France and agreed to be the Prime Minister if Bảo Đại would give him military and civilian control. On 25 June 1954, Diệm returned from exile, arriving at Tân Sơn Nhứt airport in Saigon. On 7 July 1954, Diệm established his new government with a cabinet of 18 people.