Neil - can you please take a look at this, and merge when you are happy with it. Thanks.