close #48, close #40 Connections