more updates per Jenny's follow-ups