Not to enter the discussions at last point but can you also remove all the - DAVE notes from the comments, especially where duplicate settings are removed and your comment just says so?
Attach the final diff as an attachment so we can all quickly test and finalise it would be great Not meaning to moan :-) Alex
