Changed envelope creation