updates for latest bw commits