added synchronization fixes