Revert "Revert "Syncing.""

This reverts commit 9c24b3b703259e417287f9a96c02eb34fab813b1.
Revert "Trying to fix bad syncing"

This reverts commit 9d0c9cf0e3ca31f7cbbe76615b54b5937307bedf.