restructured a bit #connect