refactored to remove OVVCheck