Eliminated race conditions