adapt to kwf changes