Topic Optimizations - Update 3