Some more work done...