Finished Listing 6.22, Already applyed changes