[PATCH v2 2/4] add proper probing functionality