couple of modifications for disco discovery ...from conversations