Made connection work better