Commented getConnection. More merging.