Tweaks to run a little faster