refactoring environments for future value environments
refactoring environments for future value environments..missed some