connection improvements
connection improvements