in progress: modify for ott 2.0