Sync with cb changes