Yup, that would be nice