Moved env fold inside stage