TODO that should have been removed
Synchronization modification