more perf improvements