*fixed: connect logic