Edition 2.3 -- most 2nd edition changes made.