fix 7
tips in the comments