close #9, add and data