changes for the optional wbb extension