Modified windcalc a little bit