This should be pulled into a custom label as well, can we add a story for all of these in general to be reviewed at some later point?