Updated some new helpers.