close #10 and #6