Finished through section 4.1