Better wrap method