Completed transition to separate lists. Now consistent with book on page 110.