updated to handle latest good client