topic optimizations - update 2