fixed some connection problems
Final maybe ?