Added adhoc based distinguishing