Improves randwrap