start working on improving sync