Small changes based on Ostrzy's comments
Replace Figaro with ENVied