Updates to sync with "shapeshifting" (after the fact!)