refactored environments