improve whirlwind