Sync with Rams edit