More work on sync