Updated OVA code