Some more work on generators