refactor name and keep connect