Added more synchronization