Added the solution for the final problem.  (One problem left)
bug fix