change iv to new_iv in a few places