Some more work. Added Simon