...with less wrapping