Re-organized Advanced Discussions section to have logical grouping