Finish section 5.3.3