A bit more tweaking.