Some more tweaks for your consideration