Partially fixed bug with Synchronization. Need to add a lock to the event list