More discovery activity stuff