close #7 and #6 && remove comments.