Some more change to connection