104 perf and optimizations