add make_mark_unique, and wait_guess