Moved environment call back to its origins