updated to current edition of code