Improve synchronization