rework connection determination
quick