little modify for environment