change wrapNum signature, clean up