Finished 365 thread safety

#305