More syncing..but let's clean this up now too.