[IMP] improved two-way sync, tested performance