[IMP] improved two-way sync, tested performance
[IMP] removed unnecessary code
[MERGE] merged framework changes