Added envelope controls