Some more work added ...