add 2nd part of tornado 3