Updates to Listing 6.16