small changes before persistent connection spike branch