keep checking in w/ master & deal w/ disconnectivity better