Implemented 2-way sync mechanism