Tornado recovery update

Tornado recovery update