Updated sample to deal with verification