Split out a little of Envelope