Right - check the new diff, I've accounted for that :-)