Updated helper