Stard using the wrappedfunctions helper for lots of internal functions