Chapter 99 - Made Some Improvements