Feature/controlling the connection