removed threadsafe stuff