Included Part2.cpp and other small modifications