Drafting updates based on review from Geneva team