working on cleaner disconnect experience