performance tweak, per review