Improved organization of topics.