Envy Build changes