admin now handles connection/disconnection better