Adding some more synchronization