a WWB fix and BTM improvement