more data + connections fix