Modified Final.cpp and the makefile