added two way sync