Reworked Synchronization to be much tighter