Sync with new changes.