[PATCH 3/5] add proper probing functionality