master
Some updates on thread safety