implement further connection improvements