Updated code through section 2.3.4.