#97 - Removed wrap method