Finish section 8.1