Eek - amended latest patchset with changes.