couple of modifications for disco discovery