Updates for MB LEEP envelope work