adapt for tornado 3