Sync with sparc_paper