Improvements: optimization on brand loop and fix cs