removed some over-synchronization