going back to variation of old Connected logic, passing tests