Made tornado optional