Modify some cpp files for scoring