migrating to leaflet - still working