Made changes to header files
Made changes to cpp files