Partial Wrapper Rewrite