Updates for WBB 3