Add feature 6 to file 8
fix feature 7 in file 8