some changes for ott2