adapt to firm verification changes