Did some more work on Sync mode