Add comments to wrapper
Merge wrapper