Should we make this thread safe?