Changes to connection as suggested in forum, 2013-6-22