Tweak for better performance