redid the last changes and added remove from list in disconnect