Erics last updates to connection helper