no panic; moved methods to Envelope