rename and add new function for connecting