BB16 updates