Better connect flow