Iva refactor