two-way sync
master-client optimizations