Modified last commit to not use a new connection.