Some work on wrapping