Updated envelope call, use envelope function more, etc.