more perf that should have gone with that commit