Added some more synchronization