Note that I'm still unsure about this additional wrapping. It may change.