Apologies - I just updated now to be more in line with what you suggested last time.

EDIT: the original post and the title here are now the same