finished true wind speed refactor