beta new sync
fix last bugs