Updated for disconnect