[Sync] Draft version of new code for Remote sync timing