Updated eve, moved envelope to transport layer