A bit more work added.