added fields to make sure we don't lose connections