OVS review

Needs comments to explain what is happening here.