step 2.5 - refactor on iva