CLOSE #10, work on #8 as well