now with working discovery