Johan Gély, Water Advisor at Swiss Ministry of Foreign Affairs