Moving on Leaflet 2021