modify for tornado