windpuff implemented more properly