Close #10 and #7