Update for newest windwalker