finished switch to odata