Simple env improvement