Attempt at simpler wrappers. Still seems to work somehow.