Update to 2nd edition