Finished Wrapper Rewrite