Some threading stuff
Some conflicts