Trying a different way to manage initial sync.