updated wrap with verification