refactor to remote connect started