some more work on the UK setup - untested