Updated makewrapper