Refactored ICV calls.