update to kwf master