Added full environment modifier