SW945 -- final tweaks.