Some more tweaking.