better macro-environment expansion