Leaflet upgrade work