Modify to allow manually connection.