Only drop when connected. Add restart restrictions