made race conditions a bit les slikely