Finishing new implementation of synchronization