Makes some steps in gadget search scenario pass