still revamping the connection