Some hopefully good perf improvement