Added ondiscover