adding highwinds support