close #8, #9