Fixing connecting - not finished