Based on new data from author
For consistency with 1995-08-04 style-guide
For consistency with structural class