Problem 7 solution, again need to update something