Updated Treatise changes from Clay.