Tweak for performance