new design and update to kwf 3.6