further performance tweak