Features/eugene/pure leaflet