Added some thread saving