Lab2, Part2 - More changes to Lab2.c draft