Jim's final tweaks