More syncing between v3 and v4