Major performance tweak