More work on 2nd chapter