Some more adjustments as suggested.