Before changing to OVR datatypes