Finish refactoring
To Sync unsynched
To sync unsynched