refactor iva and update it