Made to be thread based and made to be generally more stable