Updated Lab 7.2 solution