point 7 DONE
point 8 DONE