Updated some more files in Assignment2