@aphyr, yup, it makes more sense that way, see updating diff