Update syncer
Revert "Update syncer"

This reverts commit 47a1556a553ac173d8bceadee66b5aebbd4768dc.
Update syncer with flags filling; some fixes