close #2 and #5