close #30 and close #40