Update to Final Solution on Problem # 2