Last minute tweaks round 1.