Revert "Revert "Updated Wrapper""

This reverts commit 43394b44c119a0d492a5d6d458c2a77a05acbe8b.