Highlighting fix, connection logic